From 517df147c8508ec32c7ab780cc434d7f541e2bc7 Mon Sep 17 00:00:00 2001
From: "Steve M. Robbins" <smr@sumost.ca>
Date: Mon, 11 Jun 2001 20:57:23 +0000
Subject: Revert unintended commit

---
 include/cppunit/config.h | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'include/cppunit')

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
-- 
cgit v1.2.1