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.

4 files changed, 47 insertions, 13 deletions

diff --git a/src/DllPlugInTester/DllPlugInTesterTest.dsp b/src/DllPlugInTester/DllPlugInTesterTest.dsp
index 74044d6..ff91f85 100644
--- a/src/DllPlugInTester/DllPlugInTesterTest.dsp
+++ b/src/DllPlugInTester/DllPlugInTesterTest.dsp
@@ -49,7 +49,7 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit_dll.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib"
 # Begin Special Build Tool
 TargetPath=.\ReleaseTest\DllPlugInTesterTest.exe
@@ -71,15 +71,15 @@ PostBuild_Cmds=$(TargetPath)
 # PROP Intermediate_Dir "DebugTest"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /YX /FD /GZ  /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x40c /d "_DEBUG"
 # ADD RSC /l 0x40c /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../lib"
 # Begin Special Build Tool
 TargetPath=.\DebugTest\DllPlugInTesterTest.exe
@@ -112,6 +112,37 @@ SOURCE=.\CommandLineParserTest.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\lib\cppunit_dll.dll
+
+!IF  "$(CFG)" == "DllPlugInTesterTest - Win32 Release"
+
+# Begin Custom Build - Updating $(InputPath)
+IntDir=.\ReleaseTest
+InputPath=..\..\lib\cppunit_dll.dll
+InputName=cppunit_dll
+
+"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy $(InputPath) $(IntDir)\$(InputName).dll
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "DllPlugInTesterTest - Win32 Debug"
+
+# Begin Custom Build - Updating $(InputPath)
+IntDir=.\DebugTest
+InputPath=..\..\lib\cppunit_dll.dll
+InputName=cppunit_dll
+
+"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy $(InputPath) $(IntDir)\$(InputName).dll
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\lib\cppunitd_dll.dll
 
 !IF  "$(CFG)" == "DllPlugInTesterTest - Win32 Release"
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
diff --git a/src/msvc6/testrunner/TestRunnerModel.cpp b/src/msvc6/testrunner/TestRunnerModel.cpp
index a3ea830..893c107 100644
--- a/src/msvc6/testrunner/TestRunnerModel.cpp
+++ b/src/msvc6/testrunner/TestRunnerModel.cpp
@@ -6,6 +6,7 @@
 
 #include "StdAfx.h"
 #include "TestRunnerModel.h"
+#include <cppunit/tools/Algorithm.h>
 #include <algorithm>
 #include <stdexcept>
 #include <cppunit/testsuite.h>
@@ -36,9 +37,7 @@ TestRunnerModel::history() const
 void 
 TestRunnerModel::selectHistoryTest( CPPUNIT_NS::Test *test )
 {
-  History::iterator end = 
-      std::remove( m_history.begin(), m_history.end(), test );
-  m_history.erase( end, m_history.end() );
+  removeFromsSequence( m_history, test );
   
   if ( test != NULL )
     m_history.push_front( test );