summaryrefslogtreecommitdiff
path: root/include/cppunit
diff options
context:
space:
mode:
authorSteve M. Robbins <smr@sumost.ca>2001-06-18 13:27:31 +0000
committerSteve M. Robbins <smr@sumost.ca>2001-06-18 13:27:31 +0000
commit62c771b26595503eabcd56c668ee35a526fa9f72 (patch)
tree23fcb3d079f37013771d7b0c4ce463d6fdc88571 /include/cppunit
parentc4ee17dc39fa7a1f62d467c76f573150e497c7e0 (diff)
downloadcppunit-62c771b26595503eabcd56c668ee35a526fa9f72.tar.gz
Fix option setting.
Diffstat (limited to 'include/cppunit')
-rw-r--r--include/cppunit/Portability.h21
1 files changed, 13 insertions, 8 deletions
diff --git a/include/cppunit/Portability.h b/include/cppunit/Portability.h
index 2f4fa75..9c81a3b 100644
--- a/include/cppunit/Portability.h
+++ b/include/cppunit/Portability.h
@@ -10,25 +10,30 @@
# include <cppunit/config-auto.h>
#endif
-/* set non platform specific defines */
+/* Options that the library user may switch on or off.
+ * If the user has not done so, we chose default values.
+ */
+
+/* FIXME: does not belong in Portability.h (?) */
/* 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
+#ifndef CPPUNIT_USE_TYPEINFO
+#define CPPUNIT_USE_TYPEINFO CPPUNIT_HAVE_RTTI
#endif
+
/* Define to 1 if you wish to have the old-style macros
assert(), assertEqual(), assertDoublesEqual(), and assertLongsEqual() */
-#ifdef CPPUNIT_DISABLE_NAKED_ASSERT
+#ifndef CPPUNIT_ENABLE_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.) */
+#ifndef CPPUNIT_HAVE_CPP_SOURCEANNOTATION
#define CPPUNIT_HAVE_CPP_SOURCEANNOTATION 1
+#endif
+
/* perform portability hacks */