1 files changed, 17 insertions, 2 deletions
diff --git a/3rdParty/CppUnit/src/include/cppunit/extensions/TestSuiteBuilderContext.h b/3rdParty/CppUnit/src/include/cppunit/extensions/TestSuiteBuilderContext.h
index db26926..72bfa70 100644
--- a/3rdParty/CppUnit/src/include/cppunit/extensions/TestSuiteBuilderContext.h
+++ b/3rdParty/CppUnit/src/include/cppunit/extensions/TestSuiteBuilderContext.h
@@ -1,11 +1,11 @@
 #ifndef CPPUNIT_HELPER_TESTSUITEBUILDERCONTEXT_H
 #define CPPUNIT_HELPER_TESTSUITEBUILDERCONTEXT_H
 
 #include <cppunit/Portability.h>
-#include <cppunit/portability/CppUnitMap.h>
+#include <map>
 #include <string>
 
 #if CPPUNIT_NEED_DLL_DECL
 #pragma warning( push )
 #pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
 #endif
@@ -59,12 +59,27 @@ public:
    *         (returned by getFixtureName()) and\a testMethodName, 
    *         separated using '::'. This provides a fairly unique name for a given
    *         test.
    */
   std::string getTestNameFor( const std::string &testMethodName ) const;
 
+  /*! \brief Returns the name of the test for the specified method with the corresponding parameter.
+   *
+   * \param testMethodName Name (including a parameter) of the method that implements a test.
+   * \return A string that is the concatenation of the test fixture name
+   *         (returned by getFixtureName()), \a testMethodName,
+   *         separated using '::' and the parameter. This provides a fairly unique name for a given
+   *         test. The parameter must be convertable to std::string through operator<<
+   *         or a specialization of CPPUNIT_NS::StringHelper::toString needs to exist.
+   */
+  template<typename T>
+  std::string getTestNameFor( const std::string &testMethodName, const T& value ) const
+  {
+      return m_namer.getTestNameFor(testMethodName, value);
+  }
+
   /*! \brief Adds property pair.
    * \param key   PropertyKey string to add.
    * \param value PropertyValue string to add.
    */
   void addProperty( const std::string &key, 
                     const std::string &value );
@@ -78,13 +93,13 @@ protected:
   TestFixture *makeTestFixture() const;
 
   // Notes: we use a vector here instead of a map to work-around the
   // shared std::map in dll bug in VC6.
   // See http://www.dinkumware.com/vc_fixes.html for detail.
   typedef std::pair<std::string,std::string> Property;
-  typedef CppUnitVector<Property> Properties;
+  typedef std::vector<Property> Properties;
 
   TestSuite &m_suite;
   const TestNamer &m_namer;
   TestFixtureFactory &m_factory;
 
 private: