1 files changed, 5 insertions, 5 deletions
diff --git a/3rdParty/CppUnit/src/include/cppunit/XmlOutputter.h b/3rdParty/CppUnit/src/include/cppunit/XmlOutputter.h
index 0de9676..2bf9411 100644
--- a/3rdParty/CppUnit/src/include/cppunit/XmlOutputter.h
+++ b/3rdParty/CppUnit/src/include/cppunit/XmlOutputter.h
@@ -9,8 +9,8 @@
 #endif
 #include <cppunit/Outputter.h>
-#include <cppunit/portability/CppUnitDeque.h>
+#include <deque>
-#include <cppunit/portability/CppUnitMap.h>
+#include <map>
 #include <cppunit/portability/Stream.h>
@@ -46,7 +46,7 @@ public:
   */
  XmlOutputter( TestResultCollector *result,
                OStream &stream,
-                std::string encoding = std::string("ISO-8859-1") );
+                const std::string& encoding = std::string("ISO-8859-1") );
  /// Destructor.
  virtual ~XmlOutputter();
@@ -85,7 +85,7 @@ public:
   */
  virtual void setStandalone( bool standalone );
-  typedef CppUnitMap<Test *,TestFailure*, std::less<Test*> > FailedTests;
+  typedef std::map<Test *,TestFailure*, std::less<Test*> > FailedTests;
  /*! \brief Sets the root element and adds its children.
   *
@@ -137,7 +137,7 @@ protected:
  virtual void fillFailedTestsMap( FailedTests &failedTests );
 protected:
-  typedef CppUnitDeque<XmlOutputterHook *> Hooks;
+  typedef std::deque<XmlOutputterHook *> Hooks;
  TestResultCollector *m_result;
  OStream &m_stream;

diff --git a/3rdParty/CppUnit/src/include/cppunit/XmlOutputter.h b/3rdParty/CppUnit/src/include/cppunit/XmlOutputter.h index 0de9676..2bf9411 100644 --- a/3rdParty/CppUnit/src/include/cppunit/XmlOutputter.h +++ b/3rdParty/CppUnit/src/include/cppunit/XmlOutputter.h
@@ -9,8 +9,8 @@
9	#endif	9	#endif
10		10
11	#include <cppunit/Outputter.h>	11	#include <cppunit/Outputter.h>
12	#include <cppunit/portability/CppUnitDeque.h>	12	#include <deque>
13	#include <cppunit/portability/CppUnitMap.h>	13	#include <map>
14	#include <cppunit/portability/Stream.h>	14	#include <cppunit/portability/Stream.h>
15		15
16		16
@@ -46,7 +46,7 @@ public:
46	*/	46	*/
47	XmlOutputter( TestResultCollector *result,	47	XmlOutputter( TestResultCollector *result,
48	OStream &stream,	48	OStream &stream,
49	std::string encoding = std::string("ISO-8859-1") );	49	const std::string& encoding = std::string("ISO-8859-1") );
50		50
51	/// Destructor.	51	/// Destructor.
52	virtual ~XmlOutputter();	52	virtual ~XmlOutputter();
@@ -85,7 +85,7 @@ public:
85	*/	85	*/
86	virtual void setStandalone( bool standalone );	86	virtual void setStandalone( bool standalone );
87		87
88	typedef CppUnitMap<Test ,TestFailure, std::less<Test*> > FailedTests;	88	typedef std::map<Test ,TestFailure, std::less<Test*> > FailedTests;
89		89
90	/*! \brief Sets the root element and adds its children.	90	/*! \brief Sets the root element and adds its children.
91	*	91	*
@@ -137,7 +137,7 @@ protected:
137	virtual void fillFailedTestsMap( FailedTests &failedTests );	137	virtual void fillFailedTestsMap( FailedTests &failedTests );
138		138
139	protected:	139	protected:
140	typedef CppUnitDeque<XmlOutputterHook *> Hooks;	140	typedef std::deque<XmlOutputterHook *> Hooks;
141		141
142	TestResultCollector *m_result;	142	TestResultCollector *m_result;
143	OStream &m_stream;	143	OStream &m_stream;