From 4ca86cd4fd9b7a8c2dd60c1b62724b18b7bd5ec7 Mon Sep 17 00:00:00 2001
From: Baptiste Lepilleur <gaiacrtn@free.fr>
Date: Tue, 11 Mar 2003 19:06:34 +0000
Subject: 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.
---
 src/cppunit/TestResult.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

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 );
 }
 
 
-- 
cgit v1.2.1