summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/CppUnit/src/include/cppunit/Message.h')
-rw-r--r--3rdParty/CppUnit/src/include/cppunit/Message.h12
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
15CPPUNIT_NS_BEGIN 15CPPUNIT_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
38class CPPUNIT_API Message 34class CPPUNIT_API Message
39{ 35{
40public: 36public:
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:
141private: 139private:
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