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/TestPath.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/TestPath.h')
| -rw-r--r-- | 3rdParty/CppUnit/src/include/cppunit/TestPath.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/3rdParty/CppUnit/src/include/cppunit/TestPath.h b/3rdParty/CppUnit/src/include/cppunit/TestPath.h index c3c851c..8934479 100644 --- a/3rdParty/CppUnit/src/include/cppunit/TestPath.h +++ b/3rdParty/CppUnit/src/include/cppunit/TestPath.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z | 8 | #pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z |
| 9 | #endif | 9 | #endif |
| 10 | 10 | ||
| 11 | #include <cppunit/portability/CppUnitDeque.h> | 11 | #include <deque> |
| 12 | #include <string> | 12 | #include <string> |
| 13 | 13 | ||
| 14 | CPPUNIT_NS_BEGIN | 14 | CPPUNIT_NS_BEGIN |
| @@ -16,11 +16,6 @@ CPPUNIT_NS_BEGIN | |||
| 16 | 16 | ||
| 17 | class Test; | 17 | class Test; |
| 18 | 18 | ||
| 19 | #if CPPUNIT_NEED_DLL_DECL | ||
| 20 | // template class CPPUNIT_API std::deque<Test *>; | ||
| 21 | #endif | ||
| 22 | |||
| 23 | |||
| 24 | /*! \brief A List of Test representing a path to access a Test. | 19 | /*! \brief A List of Test representing a path to access a Test. |
| 25 | * \ingroup ExecutingTest | 20 | * \ingroup ExecutingTest |
| 26 | * | 21 | * |
| @@ -174,7 +169,7 @@ protected: | |||
| 174 | void checkIndexValid( int index ) const; | 169 | void checkIndexValid( int index ) const; |
| 175 | 170 | ||
| 176 | /// A list of test names. | 171 | /// A list of test names. |
| 177 | typedef CppUnitDeque<std::string> PathTestNames; | 172 | typedef std::deque<std::string> PathTestNames; |
| 178 | 173 | ||
| 179 | /*! \brief Splits a path string into its test name components. | 174 | /*! \brief Splits a path string into its test name components. |
| 180 | * \param pathAsString Path string created with toString(). | 175 | * \param pathAsString Path string created with toString(). |
| @@ -199,7 +194,7 @@ protected: | |||
| 199 | PathTestNames &testNames ); | 194 | PathTestNames &testNames ); |
| 200 | 195 | ||
| 201 | protected: | 196 | protected: |
| 202 | typedef CppUnitDeque<Test *> Tests; | 197 | typedef std::deque<Test *> Tests; |
| 203 | Tests m_tests; | 198 | Tests m_tests; |
| 204 | 199 | ||
| 205 | }; | 200 | }; |