diff options
| author | Steve M. Robbins <smr@sumost.ca> | 2001-06-11 20:57:23 +0000 |
|---|---|---|
| committer | Steve M. Robbins <smr@sumost.ca> | 2001-06-11 20:57:23 +0000 |
| commit | 517df147c8508ec32c7ab780cc434d7f541e2bc7 (patch) | |
| tree | d150daf2603b396feb9e8b27937e104a8aacc23b /include/cppunit | |
| parent | c472c67d5a8b398e1d57395894ae8b7cb990a873 (diff) | |
| download | cppunit-517df147c8508ec32c7ab780cc434d7f541e2bc7.tar.gz | |
Revert unintended commit
Diffstat (limited to 'include/cppunit')
| -rw-r--r-- | include/cppunit/config.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/include/cppunit/config.h b/include/cppunit/config.h index 1c3f2a1..e515a51 100644 --- a/include/cppunit/config.h +++ b/include/cppunit/config.h @@ -1,16 +1,37 @@ #ifndef CPPUNIT_CONFIG_H #define CPPUNIT_CONFIG_H +/* Default configuration for VC++ 6.0. + * On Unix platform, this file is generated by the configure script. + * + * Since we don't have that in everyday VC++, we define this header with + * reasonable default: + * - RTTI enabled + * - compatibility with old assert macro, now replaced with CPPUNIT_ASSERT. + * - preprocessor can expand expression + * + * Define the symbol CPPUNIT_DONT_USE_TYPEINFO to disable RTTI. + * Define the symbol CPPUNIT_DISABLE_NAKED_ASSERT to disable naked assert. + */ /* Define to 1 if the compiler supports Run-Time Type Identification */ +#ifdef CPPUNIT_DONT_USE_TYPEINFO +#define CPPUNIT_USE_TYPEINFO 0 +#else #define CPPUNIT_USE_TYPEINFO 1 +#endif /* Define to 1 if you wish to have the old-style macros assert(), assertEqual(), assertDoublesEqual(), and assertLongsEqual() */ +#ifdef CPPUNIT_DISABLE_NAKED_ASSERT #define CPPUNIT_ENABLE_NAKED_ASSERT 0 +#else +#define CPPUNIT_ENABLE_NAKED_ASSERT 1 +#endif /* Define to 1 if the preprocessor expands (#foo) to "foo" (quotes incl.) */ #define CPPUNIT_HAVE_CPP_SOURCEANNOTATION 1 +#pragma warning( disable: 4786 ) #endif |