From 2b9f4b072bfb4129ee8eaaa86b3f068bdd2d581d Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Sun, 11 Dec 2016 08:44:46 +0100
Subject: remove support for old broken C++ compilers

---
 src/cppunit/ProtectorChain.h        |  6 +++---
 src/cppunit/TestFactoryRegistry.cpp |  4 ++--
 src/cppunit/TestSuite.cpp           |  2 +-
 src/cppunit/cppunit.dsp             | 20 --------------------
 src/cppunit/cppunit.vcproj          | 20 --------------------
 src/cppunit/cppunit.vcxproj         |  7 +------
 src/cppunit/cppunit_dll.dsp         | 20 --------------------
 src/cppunit/cppunit_dll.vcproj      | 20 --------------------
 src/cppunit/cppunit_dll.vcxproj     |  7 +------
 9 files changed, 8 insertions(+), 98 deletions(-)

(limited to 'src/cppunit')

diff --git a/src/cppunit/ProtectorChain.h b/src/cppunit/ProtectorChain.h
index 1941131..9123782 100644
--- a/src/cppunit/ProtectorChain.h
+++ b/src/cppunit/ProtectorChain.h
@@ -2,7 +2,7 @@
 #define CPPUNIT_PROTECTORCHAIN_H
 
 #include <cppunit/Protector.h>
-#include <cppunit/portability/CppUnitDeque.h>
+#include <deque>
 
 #if CPPUNIT_NEED_DLL_DECL
 #pragma warning( push )
@@ -36,10 +36,10 @@ private:
   class ProtectFunctor;
 
 private:
-  typedef CppUnitDeque<Protector *> Protectors;
+  typedef std::deque<Protector *> Protectors;
   Protectors m_protectors;
 
-  typedef CppUnitDeque<Functor *> Functors;
+  typedef std::deque<Functor *> Functors;
 };
 
 
diff --git a/src/cppunit/TestFactoryRegistry.cpp b/src/cppunit/TestFactoryRegistry.cpp
index 4f76f66..f1623cc 100644
--- a/src/cppunit/TestFactoryRegistry.cpp
+++ b/src/cppunit/TestFactoryRegistry.cpp
@@ -1,6 +1,6 @@
 #include <cppunit/config/SourcePrefix.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/portability/CppUnitMap.h>
+#include <map>
 #include <cppunit/TestSuite.h>
 #include <assert.h>
 
@@ -12,7 +12,7 @@ CPPUNIT_NS_BEGIN
 class TestFactoryRegistryList
 {
 private:
-  typedef CppUnitMap<std::string, TestFactoryRegistry *, std::less<std::string> > Registries;
+  typedef std::map<std::string, TestFactoryRegistry *, std::less<std::string> > Registries;
   Registries m_registries;
 
   enum State {
diff --git a/src/cppunit/TestSuite.cpp b/src/cppunit/TestSuite.cpp
index 14cfcd2..b5d6db3 100644
--- a/src/cppunit/TestSuite.cpp
+++ b/src/cppunit/TestSuite.cpp
@@ -40,7 +40,7 @@ TestSuite::addTest( Test *test )
 }
 
 
-const CppUnitVector<Test *> &
+const std::vector<Test *> &
 TestSuite::getTests() const
 {
   return m_tests;
diff --git a/src/cppunit/cppunit.dsp b/src/cppunit/cppunit.dsp
index 55f4769..4691351 100644
--- a/src/cppunit/cppunit.dsp
+++ b/src/cppunit/cppunit.dsp
@@ -227,26 +227,6 @@ SOURCE=..\..\include\cppunit\config\CppUnitApi.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\portability\CppUnitDeque.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\cppunit\portability\CppUnitMap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\cppunit\portability\CppUnitSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\cppunit\portability\CppUnitStack.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\cppunit\portability\CppUnitVector.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\cppunit\portability\FloatingPoint.h
 # End Source File
 # Begin Source File
diff --git a/src/cppunit/cppunit.vcproj b/src/cppunit/cppunit.vcproj
index 2c6c82b..fba7d6f 100644
--- a/src/cppunit/cppunit.vcproj
+++ b/src/cppunit/cppunit.vcproj
@@ -414,26 +414,6 @@
 				RelativePath="..\..\include\cppunit\config\CppUnitApi.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\cppunit\portability\CppUnitDeque.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\cppunit\portability\CppUnitMap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\cppunit\portability\CppUnitSet.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\cppunit\portability\CppUnitStack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\cppunit\portability\CppUnitVector.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\cppunit\portability\FloatingPoint.h"
 				>
diff --git a/src/cppunit/cppunit.vcxproj b/src/cppunit/cppunit.vcxproj
index 0367d20..7b7b270 100644
--- a/src/cppunit/cppunit.vcxproj
+++ b/src/cppunit/cppunit.vcxproj
@@ -328,11 +328,6 @@
     <ClInclude Include="..\..\include\cppunit\config\config-mac.h" />
     <ClInclude Include="..\..\include\cppunit\config\config-msvc6.h" />
     <ClInclude Include="..\..\include\cppunit\config\CppUnitApi.h" />
-    <ClInclude Include="..\..\include\cppunit\portability\CppUnitDeque.h" />
-    <ClInclude Include="..\..\include\cppunit\portability\CppUnitMap.h" />
-    <ClInclude Include="..\..\include\cppunit\portability\CppUnitSet.h" />
-    <ClInclude Include="..\..\include\cppunit\portability\CppUnitStack.h" />
-    <ClInclude Include="..\..\include\cppunit\portability\CppUnitVector.h" />
     <ClInclude Include="..\..\include\cppunit\portability\FloatingPoint.h" />
     <ClInclude Include="..\..\include\cppunit\Portability.h" />
     <ClInclude Include="..\..\include\cppunit\config\SelectDllLoader.h" />
@@ -396,4 +391,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/cppunit/cppunit_dll.dsp b/src/cppunit/cppunit_dll.dsp
index a7a73c7..9b3a0dd 100644
--- a/src/cppunit/cppunit_dll.dsp
+++ b/src/cppunit/cppunit_dll.dsp
@@ -431,26 +431,6 @@ SOURCE=..\..\include\cppunit\config\CppUnitApi.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\cppunit\portability\CppUnitDeque.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\cppunit\portability\CppUnitMap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\cppunit\portability\CppUnitSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\cppunit\portability\CppUnitStack.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\cppunit\portability\CppUnitVector.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\cppunit\Portability.h
 # End Source File
 # Begin Source File
diff --git a/src/cppunit/cppunit_dll.vcproj b/src/cppunit/cppunit_dll.vcproj
index 57c0390..bdfdbca 100644
--- a/src/cppunit/cppunit_dll.vcproj
+++ b/src/cppunit/cppunit_dll.vcproj
@@ -1075,26 +1075,6 @@
 				RelativePath="..\..\include\cppunit\config\CppUnitApi.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\cppunit\portability\CppUnitDeque.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\cppunit\portability\CppUnitMap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\cppunit\portability\CppUnitSet.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\cppunit\portability\CppUnitStack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\cppunit\portability\CppUnitVector.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\cppunit\Portability.h"
 				>
diff --git a/src/cppunit/cppunit_dll.vcxproj b/src/cppunit/cppunit_dll.vcxproj
index 292e62f..71ef783 100644
--- a/src/cppunit/cppunit_dll.vcxproj
+++ b/src/cppunit/cppunit_dll.vcxproj
@@ -370,11 +370,6 @@ copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib</Command>
     <ClInclude Include="..\..\include\cppunit\config\config-mac.h" />
     <ClInclude Include="..\..\include\cppunit\config\config-msvc6.h" />
     <ClInclude Include="..\..\include\cppunit\config\CppUnitApi.h" />
-    <ClInclude Include="..\..\include\cppunit\portability\CppUnitDeque.h" />
-    <ClInclude Include="..\..\include\cppunit\portability\CppUnitMap.h" />
-    <ClInclude Include="..\..\include\cppunit\portability\CppUnitSet.h" />
-    <ClInclude Include="..\..\include\cppunit\portability\CppUnitStack.h" />
-    <ClInclude Include="..\..\include\cppunit\portability\CppUnitVector.h" />
     <ClInclude Include="..\..\include\cppunit\Portability.h" />
     <ClInclude Include="..\..\include\cppunit\config\SelectDllLoader.h" />
     <ClInclude Include="..\..\include\cppunit\config\SourcePrefix.h" />
@@ -429,4 +424,4 @@ copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib</Command>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
-- 
cgit v1.2.1