Src/msvc6/testrunner/TestRunner.

src/msvc6/testrunner/TestRunner.dsp: fixed release configuration.

* src/msvc6/testrunner/TestRunner.dsw: added DSPlugIn.dsp. TestRunner
depends on DSPlugIn.

* src/msvc6/testrunner/TestRunner.cpp:
* src/msvc6/testrunner/TestRunnerDlg.h:
* src/msvc6/testrunner/TestRunnerDlg.cpp:
* src/msvc6/testrunner/MsDevCallerListCtrl.cpp:
* src/msvc6/testrunner/MsDevCallerListCtrl.h:
* src/msvc6/DSPlugIn/*: integrated patch from
Patrick Berny (PPBerny@web.de). An add-ins for VC++. Double-cliking
a failed test in the TestRunner, VC++ will open the source file and
go to the failure location.

* src/cppunit/Exception.cpp:
* include/cppunit/Exception.h: compile fix, call to overrided
operator = of parent class failed. Using typedef to the parent
class fix that.

* src/cppunit/cppunit.dsp: added TestFixture.h

* src/cppunit/TestFactoryRegistry.cpp: removed <utility> which isn't
needed any more.

* include/cppunit/TestCase.h:
* include/cppunit/TestSuite.h:
* include/cppunit/extensions/TestFactoryRegistry.h: added
include <Portability.h> before any other includes to remove warning
with VC++.

* include/cppunit/Portability.h: moved platform specific includes at
the beginning of the header. fixed CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION
declaration.

* include/cppunit/config-msvc6.h: removed pragma once (useless, should
be put in each header to have an effect).

6 files changed, 19 insertions, 15 deletions

diff --git a/include/cppunit/Exception.h b/include/cppunit/Exception.h
index 8467c0a..39fbc02 100644
--- a/include/cppunit/Exception.h
+++ b/include/cppunit/Exception.h
@@ -53,6 +53,10 @@ public:
     static Type type();
 
 private:
+    // VC++ does not recognize call to parent class when prefixed
+    // with a namespace. This is a workaround.
+    typedef std::exception SuperClass;
+
     std::string m_message;
     long m_lineNumber;
     std::string m_fileName;
diff --git a/include/cppunit/Portability.h b/include/cppunit/Portability.h
index 6071626..3d3e60f 100644
--- a/include/cppunit/Portability.h
+++ b/include/cppunit/Portability.h
@@ -24,8 +24,8 @@
 
 
 /* Define to 1 if the preprocessor expands (#foo) to "foo" (quotes incl.) */
-#ifndef CPPUNIT_HAVE_CPP_SOURCEANNOTATION
-#define CPPUNIT_HAVE_CPP_SOURCEANNOTATION   1
+#ifndef CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION
+#define CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION   1
 #endif
 
 
@@ -65,10 +65,4 @@
 #endif
 
 
-#if _MSC_VER > 1000     // VC++
-#pragma once
-#pragma warning( disable : 4786 )   // disable warning debug symbol > 255...
-#endif // _MSC_VER > 1000
-
-
 #endif // CPPUNIT_PORTABILITY_H
diff --git a/include/cppunit/TestCase.h b/include/cppunit/TestCase.h
index 4073665..e8767f9 100644
--- a/include/cppunit/TestCase.h
+++ b/include/cppunit/TestCase.h
@@ -1,10 +1,11 @@
 #ifndef CPPUNIT_TESTCASE_H
 #define CPPUNIT_TESTCASE_H
 
-#include <string>
+#include <cppunit/Portability.h>
 #include <cppunit/Test.h>
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
+#include <string>
 
 
 namespace CppUnit {
diff --git a/include/cppunit/TestSuite.h b/include/cppunit/TestSuite.h
index a3cfc65..11be9ee 100644
--- a/include/cppunit/TestSuite.h
+++ b/include/cppunit/TestSuite.h
@@ -1,9 +1,10 @@
 #ifndef CPPUNIT_TESTSUITE_H    // -*- C++ -*-
 #define CPPUNIT_TESTSUITE_H
 
+#include <cppunit/Portability.h>
+#include <cppunit/Test.h>
 #include <vector>
 #include <string>
-#include <cppunit/Test.h>
 
 namespace CppUnit {
 
diff --git a/include/cppunit/config-msvc6.h b/include/cppunit/config-msvc6.h
index df6b29c..00b6037 100644
--- a/include/cppunit/config-msvc6.h
+++ b/include/cppunit/config-msvc6.h
@@ -42,6 +42,13 @@
 #ifndef CPPUNIT_VERSION 
 #define CPPUNIT_VERSION  "1.5.5" 
 #endif
+
+
+
+#if _MSC_VER > 1000     // VC++
+#pragma warning( disable : 4786 )   // disable warning debug symbol > 255...
+#endif // _MSC_VER > 1000
+
  
 /* _INCLUDE_CPPUNIT_CONFIG_MSVC6_H */
 #endif
diff --git a/include/cppunit/extensions/TestFactoryRegistry.h b/include/cppunit/extensions/TestFactoryRegistry.h
index 2475e57..e835321 100644
--- a/include/cppunit/extensions/TestFactoryRegistry.h
+++ b/include/cppunit/extensions/TestFactoryRegistry.h
@@ -1,13 +1,10 @@
 #ifndef CPPUNIT_EXTENSIONS_TESTFACTORYREGISTRY_H
 #define CPPUNIT_EXTENSIONS_TESTFACTORYREGISTRY_H
 
-#if _MSC_VER > 1000     // VC++
-#pragma warning( disable : 4786 )   // disable warning debug symbol > 255...
-#endif // _MSC_VER > 1000
-
+#include <cppunit/Portability.h>
+#include <cppunit/extensions/TestFactory.h>
 #include <map>
 #include <string>
-#include <cppunit/extensions/TestFactory.h>
 
 namespace CppUnit {