summaryrefslogtreecommitdiff
path: root/src/cppunit
diff options
context:
space:
mode:
authorBaptiste Lepilleur <gaiacrtn@free.fr>2003-03-11 19:06:34 +0000
committerBaptiste Lepilleur <gaiacrtn@free.fr>2003-03-11 19:06:34 +0000
commit4ca86cd4fd9b7a8c2dd60c1b62724b18b7bd5ec7 (patch)
tree12616b573402b989e34a38514ae625cbf7b85f94 /src/cppunit
parentc349ff0461024ca2cbc1e9844abfdb5996338f04 (diff)
downloadcppunit-4ca86cd4fd9b7a8c2dd60c1b62724b18b7bd5ec7.tar.gz
Include/cppunit/tools/Algorithm.
include/cppunit/tools/Algorithm.h: * src/cppunit/TestResult.cpp: * src/msvc6/testrunner/TestRunnerModel.cpp: added removeFromSequence algorithm in Algorithm.h to fix STLPort compatibility issue (std::remove use the one of cstdio instead of algorithm). Bug #694971. * include/cppunit/extensions/TestNamer.h: fixed bug #662666 (missing include for typeinfo). * src/cppunit/TestResult.cpp: TestFailure are no longer passed as temporary, but explicitely instantiated on the stack. Work around AIX compiler bug.
Diffstat (limited to 'src/cppunit')
-rw-r--r--src/cppunit/TestResult.cpp12
-rw-r--r--src/cppunit/cppunit.dsp4
2 files changed, 10 insertions, 6 deletions
diff --git a/src/cppunit/TestResult.cpp b/src/cppunit/TestResult.cpp
index 90658ab..6be19f1 100644
--- a/src/cppunit/TestResult.cpp
+++ b/src/cppunit/TestResult.cpp
@@ -2,6 +2,7 @@
#include <cppunit/TestFailure.h>
#include <cppunit/TestListener.h>
#include <cppunit/TestResult.h>
+#include <cppunit/tools/Algorithm.h>
#include <algorithm>
#include "DefaultProtector.h"
#include "ProtectorChain.h"
@@ -37,14 +38,16 @@ void
TestResult::addError( Test *test,
Exception *e )
{
- addFailure( TestFailure( test, e, true ) );
+ TestFailure failure( test, e, true );
+ addFailure( failure );
}
void
TestResult::addFailure( Test *test, Exception *e )
{
- addFailure( TestFailure( test, e, false ) );
+ TestFailure failure( test, e, false );
+ addFailure( failure );
}
@@ -131,10 +134,7 @@ void
TestResult::removeListener ( TestListener *listener )
{
ExclusiveZone zone( m_syncObject );
- m_listeners.erase( std::remove( m_listeners.begin(),
- m_listeners.end(),
- listener ),
- m_listeners.end());
+ removeFromSequence( m_listeners, listener );
}
diff --git a/src/cppunit/cppunit.dsp b/src/cppunit/cppunit.dsp
index 311f3f8..47f6be7 100644
--- a/src/cppunit/cppunit.dsp
+++ b/src/cppunit/cppunit.dsp
@@ -608,6 +608,10 @@ SOURCE=.\Win32DynamicLibraryManager.cpp
# PROP Default_Filter ""
# Begin Source File
+SOURCE=..\..\include\cppunit\tools\Algorithm.h
+# End Source File
+# Begin Source File
+
SOURCE=.\StringTools.cpp
# End Source File
# Begin Source File