summaryrefslogtreecommitdiff
path: root/include/cppunit
diff options
context:
space:
mode:
authorBaptiste Lepilleur <gaiacrtn@free.fr>2005-07-05 20:17:41 +0000
committerBaptiste Lepilleur <gaiacrtn@free.fr>2005-07-05 20:17:41 +0000
commit89a9cb09246597740711e4d7388cf2314109ea70 (patch)
treea81bcff632c66f51d6aa6f8a472912beef668786 /include/cppunit
parentdf5f25870ead25e99a0aa55f5183e00e47475867 (diff)
downloadcppunit-89a9cb09246597740711e4d7388cf2314109ea70.tar.gz
Fixed memory leak occuring when calling reset().
* include/cppunit/TestResultCollector.h * src/cppunit/TestResultCollector.cpp: fixed memory leak occuring when calling reset(). * src/cppunit/DllMain.cpp: added work-around for mingw compilation for BLENDFUNCTION macro issue when including windows.h. * src/qttestrunner/TestRunnerDlgImpl.cpp: fixed display of multiline messages. * include/cppunit/Portability.h: better integration of compiler output for gcc on Mac OS X with Xcode (contributed by Claus Broch).
Diffstat (limited to 'include/cppunit')
-rw-r--r--include/cppunit/Portability.h5
-rw-r--r--include/cppunit/TestResultCollector.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/include/cppunit/Portability.h b/include/cppunit/Portability.h
index 159cd44..835c45f 100644
--- a/include/cppunit/Portability.h
+++ b/include/cppunit/Portability.h
@@ -79,8 +79,13 @@
// If not define, assumes that it's gcc
// See class CompilerOutputter for format.
#if !defined(CPPUNIT_COMPILER_LOCATION_FORMAT)
+#if defined(__GNUC__) && ( defined(__APPLE_CPP__) || defined(__APPLE_CC__) )
+// gcc/Xcode integration on Mac OS X
+# define CPPUNIT_COMPILER_LOCATION_FORMAT "%p:%l: "
+#else
# define CPPUNIT_COMPILER_LOCATION_FORMAT "%f:%l:"
#endif
+#endif
// If CPPUNIT_HAVE_CPP_CAST is defined, then c++ style cast will be used,
// otherwise, C style cast are used.
diff --git a/include/cppunit/TestResultCollector.h b/include/cppunit/TestResultCollector.h
index 65b77cd..01b0a54 100644
--- a/include/cppunit/TestResultCollector.h
+++ b/include/cppunit/TestResultCollector.h
@@ -61,6 +61,8 @@ public:
virtual const Tests &tests() const;
protected:
+ void freeFailures();
+
Tests m_tests;
TestFailures m_failures;
int m_testErrors;