Swiftdiff options
| author | Tobias Markmann <tobias.markmann@isode.com> | 2019-11-14 21:08:53 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tobias.markmann@isode.com> | 2019-11-15 11:58:11 (GMT) |
| commit | 8230b23238b4d0ef0fcde01a799758558d502fa1 (patch) | |
| tree | 849251b42e457357b86a2ba91e9b78f635cc55a3 /3rdParty/CppUnit/src/include/cppunit/XmlOutputter.h | |
| parent | caca46ceedddd43c707e7eda9b4c765d61730ccb (diff) | |
| download | swift-8230b23238b4d0ef0fcde01a799758558d502fa1.zip swift-8230b23238b4d0ef0fcde01a799758558d502fa1.tar.bz2 | |
Update 3rdParty/CppUnit to version 1.14.0
This gets rid of std::auto_ptr usage and its deprecation
warnings.
Test-Information:
Builds and tests pass on macOS.
Change-Id: I299a0a8d9aa2ead15c933e83a2e3e53f84a4f5b7
Diffstat (limited to '3rdParty/CppUnit/src/include/cppunit/XmlOutputter.h')
| -rw-r--r-- | 3rdParty/CppUnit/src/include/cppunit/XmlOutputter.h | 10 |
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 @@ | |||
| 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; |