diff options
| author | Bastiaan Bakker <bastiaan.bakker@lifeline.nl> | 2001-05-05 22:34:50 +0000 |
|---|---|---|
| committer | Bastiaan Bakker <bastiaan.bakker@lifeline.nl> | 2001-05-05 22:34:50 +0000 |
| commit | b657aa515178205772ab2e95f365bd5a77364610 (patch) | |
| tree | 680d530a1a4c6bbd3dcfa1a867ff608ed1175fa1 /include/cppunit | |
| parent | a2509e56dd1e457e88d32410d7524a1363f59e96 (diff) | |
| download | cppunit-b657aa515178205772ab2e95f365bd5a77364610.tar.gz | |
Merge of CppUnitW 1.2 phase 2.
Diffstat (limited to 'include/cppunit')
| -rw-r--r-- | include/cppunit/extensions/HelperMacros.h | 3 | ||||
| -rw-r--r-- | include/cppunit/extensions/Makefile | 2 | ||||
| -rw-r--r-- | include/cppunit/extensions/TestFactoryRegistry.h | 8 |
3 files changed, 8 insertions, 5 deletions
diff --git a/include/cppunit/extensions/HelperMacros.h b/include/cppunit/extensions/HelperMacros.h index 7c725c5..e1a4b72 100644 --- a/include/cppunit/extensions/HelperMacros.h +++ b/include/cppunit/extensions/HelperMacros.h @@ -74,7 +74,6 @@ private: \ typedef ATestCaseType __ThisTestCaseType; \ public: \ - typedef CppUnit::AutoRegisterSuite<__ThisTestCaseType> AutoRegisterSuite; \ static CppUnit::Test *suite() \ { \ __ThisTestCaseType *test =NULL; \ @@ -157,7 +156,7 @@ * \see CU_TEST_SUITE, CppUnit::AutoRegisterSuite. */ #define CU_TEST_SUITE_REGISTRATION( ATestCaseType ) \ - static ATestCaseType::AutoRegisterSuite \ + static CppUnit::AutoRegisterSuite< ATestCaseType > \ CU_MAKE_UNIQUE_NAME(__autoRegisterSuite ) diff --git a/include/cppunit/extensions/Makefile b/include/cppunit/extensions/Makefile index fa40700..aab8dc0 100644 --- a/include/cppunit/extensions/Makefile +++ b/include/cppunit/extensions/Makefile @@ -16,7 +16,7 @@ SHELL = /bin/sh srcdir = . top_srcdir = ../../.. -prefix = /usr/local +prefix = /home/bastiaan/tmp/cppunit exec_prefix = ${prefix} bindir = ${exec_prefix}/bin diff --git a/include/cppunit/extensions/TestFactoryRegistry.h b/include/cppunit/extensions/TestFactoryRegistry.h index fac97ec..637ab1b 100644 --- a/include/cppunit/extensions/TestFactoryRegistry.h +++ b/include/cppunit/extensions/TestFactoryRegistry.h @@ -1,6 +1,10 @@ #ifndef CPPUNIT_TESTFACTORYREGISTRY_H #define CPPUNIT_TESTFACTORYREGISTRY_H +#if _MSC_VER > 1000 // VC++ +#pragma warning( disable : 4786 ) // disable warning debug symbol > 255... +#endif // _MSC_VER > 1000 + #include <map> #include <string> #include "cppunit/extensions/AbstractTestFactory.h" @@ -64,10 +68,10 @@ namespace CppUnit { void operator =( const TestFactoryRegistry © ); private: - typedef std::map<std::string, AbstractTestFactory*> Factories; + typedef std::map<std::string, AbstractTestFactory *> Factories; Factories m_factories; - typedef std::map<std::string, TestFactoryRegistry*> NamedRegistries; + typedef std::map<std::string, TestFactoryRegistry *> NamedRegistries; std::string m_name; }; |