From 255fed3c27815d3074bdaafb2b5ed377bd4868f8 Mon Sep 17 00:00:00 2001 From: Baptiste Lepilleur Date: Tue, 5 Jun 2001 20:36:31 +0000 Subject: Src/cppunit/TypeInfoHelper. src/cppunit/TypeInfoHelper.cpp: removed #include , cppunit/config.h was already included. * src/cppunit/cppunit.dsp: removed TestAssert.cpp from project. * added/updated .cvsignore files for beter handling of windows projects. * added include/cppunit/config.h with a default configuration for VC++ 6.0. * include/cppunit/.cvsignore: removed config.h from the list of ignored file. * renamed VC++ configurations without RTTI from "Debug No CU_USE_TYPEINFO" to "Debug Crossplatform". * include/cppunit/TestAssert.h: added include for fabs(). --- include/cppunit/TestAssert.h | 1 + include/cppunit/config.h | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 include/cppunit/config.h (limited to 'include/cppunit') diff --git a/include/cppunit/TestAssert.h b/include/cppunit/TestAssert.h index 9127780..b8143d3 100644 --- a/include/cppunit/TestAssert.h +++ b/include/cppunit/TestAssert.h @@ -1,6 +1,7 @@ #ifndef CPPUNIT_TESTASSERT_H #define CPPUNIT_TESTASSERT_H +#include #include #include #include diff --git a/include/cppunit/config.h b/include/cppunit/config.h new file mode 100644 index 0000000..0314ca2 --- /dev/null +++ b/include/cppunit/config.h @@ -0,0 +1,36 @@ +#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 + + +#endif -- cgit v1.2.1