summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/CppUnit/src/include/cppunit/TestPath.h')
-rw-r--r--3rdParty/CppUnit/src/include/cppunit/TestPath.h11
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
14CPPUNIT_NS_BEGIN 14CPPUNIT_NS_BEGIN
@@ -16,11 +16,6 @@ CPPUNIT_NS_BEGIN
16 16
17class Test; 17class 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
201protected: 196protected:
202 typedef CppUnitDeque<Test *> Tests; 197 typedef std::deque<Test *> Tests;
203 Tests m_tests; 198 Tests m_tests;
204 199
205}; 200};