summaryrefslogtreecommitdiff
path: root/src/cppunit/PlugInManager.cpp
diff options
context:
space:
mode:
authorBaptiste Lepilleur <gaiacrtn@free.fr>2002-07-03 06:02:49 +0000
committerBaptiste Lepilleur <gaiacrtn@free.fr>2002-07-03 06:02:49 +0000
commitad45759ab7a47c7a7932f7e6be66f3ea106b643b (patch)
tree827097bba87b959981cc3676f0e4d90630649c0b /src/cppunit/PlugInManager.cpp
parentd8e61dcb0fd9046b44ca3e9e6868b5429eee8aa9 (diff)
downloadcppunit-ad45759ab7a47c7a7932f7e6be66f3ea106b643b.tar.gz
Include/cppunit/XmlOutputter.
include/cppunit/XmlOutputter.h: fixed XmlOutputter constructed default value initializatino which caused compilation error with BC5. * src/cppunit/PlugInManager.cpp: added missing CPPUNIT_NO_TESTPLUGIN guard. * src/msvc6/testrunner/TestRunner.dsp: * src/msvc6/testrunner/TestRunner.rc: * src/msvc6/testrunner/TestRunnerDlg.cpp: * src/msvc6/testrunner/TestRunnerDlg.h: * src/msvc6/testrunner/TreeHierarchyDlg.cpp: * src/msvc6/testrunner/TreeHierarchyDlg.h: * src/msvc6/testpluginrunner/TestPlugInRunner.dsp: * src/msvc6/testpluginrunner/TestPlugInRunner.rc: * src/msvc6/testpluginrunner/TestPlugInRunnerApp.cpp: * src/msvc6/testpluginrunner/TestPlugInRunnerDlg.cpp: * src/msvc6/testpluginrunner/TestPlugInRunnerDlg.h: applied Steven Mitter patch to fix bug #530426 (conflict between TestRunner and host application resources). Adapted patch to compile work with Unicode. * src/msvc6/testrunner/ResourceLoaders.h: * src/msvc6/testrunner/ResourceLoaders.cpp: * src/msvc6/testrunner/Change-Diary-ResourceBugFix.txt: added, from Steven Mitter's patch. Simplified loadCString() to compile with Unicode. * src/cppunit/cppunit.dsp: * src/cppunit/cppunit_dll.dsp: * src/DllPlugInTester/DllPlugInTester.dsp: * src/msvc6/testrunner/TestRunner.dsp: * src/msvc6/testpluginrunner/TestPlugInRunner.dsp: all lib, dll and exe are now created in the intermediate directory. A post-build rule is used to copy them to the lib/ directory.
Diffstat (limited to 'src/cppunit/PlugInManager.cpp')
-rw-r--r--src/cppunit/PlugInManager.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/cppunit/PlugInManager.cpp b/src/cppunit/PlugInManager.cpp
index 8f2476d..35312e4 100644
--- a/src/cppunit/PlugInManager.cpp
+++ b/src/cppunit/PlugInManager.cpp
@@ -1,6 +1,8 @@
#include <cppunit/XmlOutputterHook.h>
-#include <cppunit/plugin/PlugInManager.h>
+
+#if !defined(CPPUNIT_NO_TESTPLUGIN)
#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/plugin/PlugInManager.h>
#include <cppunit/plugin/TestPlugIn.h>
#include <cppunit/plugin/DynamicLibraryManager.h>
@@ -106,3 +108,4 @@ PlugInManager::removeXmlOutputterHooks()
} // namespace CppUnit
+#endif // !defined(CPPUNIT_NO_TESTPLUGIN)