From ad45759ab7a47c7a7932f7e6be66f3ea106b643b Mon Sep 17 00:00:00 2001
From: Baptiste Lepilleur <gaiacrtn@free.fr>
Date: Wed, 3 Jul 2002 06:02:49 +0000
Subject: 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.
---
 src/cppunit/DynamicLibraryManagerException.cpp | 29 +++++++++++++++-----------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'src/cppunit/DynamicLibraryManagerException.cpp')

diff --git a/src/cppunit/DynamicLibraryManagerException.cpp b/src/cppunit/DynamicLibraryManagerException.cpp
index 44a7e62..a5f133b 100644
--- a/src/cppunit/DynamicLibraryManagerException.cpp
+++ b/src/cppunit/DynamicLibraryManagerException.cpp
@@ -7,27 +7,32 @@ namespace CppUnit
 
 
 DynamicLibraryManagerException::DynamicLibraryManagerException( 
-                                         const std::string &libraryName )
-    : m_cause( loadingFailed )
-    , std::runtime_error( "Failed to load dynamic library: " + libraryName )
+                                         const std::string &libraryName,
+                                         const std::string &errorDetail,
+                                         Cause cause )
+    : m_cause( cause )
+    , std::runtime_error( "" )
 {
+  if ( cause == loadingFailed )
+    m_message = "Failed to load dynamic library: " + libraryName + "\n" + 
+                errorDetail;
+  else
+    m_message = "Symbol [" + errorDetail + "] not found in dynamic libary:" + 
+                libraryName;
 }
 
 
-DynamicLibraryManagerException::DynamicLibraryManagerException( 
-                                const std::string &libraryName,
-                                const std::string &symbol )
-    : m_cause( symbolNotFound )
-    , std::runtime_error( "Symbol [" + symbol + "] not found in dynamic libary:" +
-                          libraryName )
+DynamicLibraryManagerException::Cause 
+DynamicLibraryManagerException::getCause() const
 {
+  return m_cause;
 }
 
 
-DynamicLibraryManagerException::Cause 
-DynamicLibraryManagerException::getCause() const
+const char *
+DynamicLibraryManagerException::what() const throw()
 {
-  return m_cause;
+  return m_message.c_str();
 }
 
 
-- 
cgit v1.2.1