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/TestResult.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/TestResult.h')
| -rw-r--r-- | 3rdParty/CppUnit/src/include/cppunit/TestResult.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/3rdParty/CppUnit/src/include/cppunit/TestResult.h b/3rdParty/CppUnit/src/include/cppunit/TestResult.h index e7e1050..aabd80b 100644 --- a/3rdParty/CppUnit/src/include/cppunit/TestResult.h +++ b/3rdParty/CppUnit/src/include/cppunit/TestResult.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #endif | 9 | #endif |
| 10 | 10 | ||
| 11 | #include <cppunit/SynchronizedObject.h> | 11 | #include <cppunit/SynchronizedObject.h> |
| 12 | #include <cppunit/portability/CppUnitDeque.h> | 12 | #include <deque> |
| 13 | #include <string> | 13 | #include <string> |
| 14 | 14 | ||
| 15 | CPPUNIT_NS_BEGIN | 15 | CPPUNIT_NS_BEGIN |
| @@ -24,10 +24,6 @@ class TestFailure; | |||
| 24 | class TestListener; | 24 | class TestListener; |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | #if CPPUNIT_NEED_DLL_DECL | ||
| 28 | // template class CPPUNIT_API std::deque<TestListener *>; | ||
| 29 | #endif | ||
| 30 | |||
| 31 | /*! \brief Manages TestListener. | 27 | /*! \brief Manages TestListener. |
| 32 | * \ingroup TrackingTestExecution | 28 | * \ingroup TrackingTestExecution |
| 33 | * | 29 | * |
| @@ -133,7 +129,7 @@ protected: | |||
| 133 | virtual void endTestRun( Test *test ); | 129 | virtual void endTestRun( Test *test ); |
| 134 | 130 | ||
| 135 | protected: | 131 | protected: |
| 136 | typedef CppUnitDeque<TestListener *> TestListeners; | 132 | typedef std::deque<TestListener *> TestListeners; |
| 137 | TestListeners m_listeners; | 133 | TestListeners m_listeners; |
| 138 | ProtectorChain *m_protectorChain; | 134 | ProtectorChain *m_protectorChain; |
| 139 | bool m_stop; | 135 | bool m_stop; |