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/Message.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/Message.h')
| -rw-r--r-- | 3rdParty/CppUnit/src/include/cppunit/Message.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/3rdParty/CppUnit/src/include/cppunit/Message.h b/3rdParty/CppUnit/src/include/cppunit/Message.h index 1ae51cc..c3d8d92 100644 --- a/3rdParty/CppUnit/src/include/cppunit/Message.h +++ b/3rdParty/CppUnit/src/include/cppunit/Message.h | |||
| @@ -8,17 +8,13 @@ | |||
| 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 | 14 | ||
| 15 | CPPUNIT_NS_BEGIN | 15 | CPPUNIT_NS_BEGIN |
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | #if CPPUNIT_NEED_DLL_DECL | ||
| 19 | // template class CPPUNIT_API std::deque<std::string>; | ||
| 20 | #endif | ||
| 21 | |||
| 22 | /*! \brief Message associated to an Exception. | 18 | /*! \brief Message associated to an Exception. |
| 23 | * \ingroup CreatingNewAssertions | 19 | * \ingroup CreatingNewAssertions |
| 24 | * A message is composed of two items: | 20 | * A message is composed of two items: |
| @@ -38,7 +34,7 @@ CPPUNIT_NS_BEGIN | |||
| 38 | class CPPUNIT_API Message | 34 | class CPPUNIT_API Message |
| 39 | { | 35 | { |
| 40 | public: | 36 | public: |
| 41 | Message(); | 37 | Message() {}; |
| 42 | 38 | ||
| 43 | // Ensure thread-safe copy by detaching the string. | 39 | // Ensure thread-safe copy by detaching the string. |
| 44 | Message( const Message &other ); | 40 | Message( const Message &other ); |
| @@ -57,6 +53,8 @@ public: | |||
| 57 | const std::string &detail2, | 53 | const std::string &detail2, |
| 58 | const std::string &detail3 ); | 54 | const std::string &detail3 ); |
| 59 | 55 | ||
| 56 | virtual ~Message(); | ||
| 57 | |||
| 60 | Message &operator =( const Message &other ); | 58 | Message &operator =( const Message &other ); |
| 61 | 59 | ||
| 62 | /*! \brief Returns the short description. | 60 | /*! \brief Returns the short description. |
| @@ -141,7 +139,7 @@ public: | |||
| 141 | private: | 139 | private: |
| 142 | std::string m_shortDescription; | 140 | std::string m_shortDescription; |
| 143 | 141 | ||
| 144 | typedef CppUnitDeque<std::string> Details; | 142 | typedef std::deque<std::string> Details; |
| 145 | Details m_details; | 143 | Details m_details; |
| 146 | }; | 144 | }; |
| 147 | 145 | ||