summaryrefslogtreecommitdiff
path: root/src/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 /src/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 'src/cppunit')
-rw-r--r--src/cppunit/DllMain.cpp1
-rw-r--r--src/cppunit/TestResultCollector.cpp7
2 files changed, 8 insertions, 0 deletions
diff --git a/src/cppunit/DllMain.cpp b/src/cppunit/DllMain.cpp
index 97d1497..51fe31e 100644
--- a/src/cppunit/DllMain.cpp
+++ b/src/cppunit/DllMain.cpp
@@ -3,6 +3,7 @@
#define NOUSER
#define NOKERNEL
#define NOSOUND
+#define BLENDFUNCTION void // for mingw & gcc
#include <windows.h>
diff --git a/src/cppunit/TestResultCollector.cpp b/src/cppunit/TestResultCollector.cpp
index eee791d..bc621c0 100644
--- a/src/cppunit/TestResultCollector.cpp
+++ b/src/cppunit/TestResultCollector.cpp
@@ -14,6 +14,12 @@ TestResultCollector::TestResultCollector( SynchronizationObject *syncObject )
TestResultCollector::~TestResultCollector()
{
+}
+
+
+void
+TestResultCollector::freeFailures()
+{
TestFailures::iterator itFailure = m_failures.begin();
while ( itFailure != m_failures.end() )
delete *itFailure++;
@@ -26,6 +32,7 @@ TestResultCollector::reset()
TestSuccessListener::reset();
ExclusiveZone zone( m_syncObject );
+ freeFailures();
m_testErrors = 0;
m_tests.clear();
m_failures.clear();