extract the code to turn a variable into a string

2 files changed, 47 insertions, 1 deletions

diff --git a/include/cppunit/tools/Makefile.am b/include/cppunit/tools/Makefile.am
index 8ce0808..79f35b6 100644
--- a/include/cppunit/tools/Makefile.am
+++ b/include/cppunit/tools/Makefile.am
@@ -3,5 +3,6 @@ libcppunitincludedir = $(includedir)/cppunit/tools
 libcppunitinclude_HEADERS = \
 	Algorithm.h		\
 	StringTools.h \
+	StringHelper.h \
 	XmlElement.h \
-	XmlDocument.h
\ No newline at end of file
+	XmlDocument.h
diff --git a/include/cppunit/tools/StringHelper.h b/include/cppunit/tools/StringHelper.h
new file mode 100644
index 0000000..3301045
--- /dev/null
+++ b/include/cppunit/tools/StringHelper.h
@@ -0,0 +1,45 @@
+#ifndef CPPUNIT_TOOLS_STRINGHELPER_H
+#define CPPUNIT_TOOLS_STRINGHELPER_H
+
+#include <cppunit/Portability.h>
+#include <cppunit/portability/Stream.h>
+#include <string>
+#include <type_traits>
+
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief Methods for converting values to strings. Replaces CPPUNIT_NS::StringTools::toString
+ */
+namespace StringHelper
+{
+
+// work around to handle C++11 enum class correctly. We need an own conversion to std::string
+// as there is no implicit coversion to int for enum class.
+
+template<typename T>
+typename std::enable_if<!std::is_enum<T>::value, std::string>::type toString(const T& x)
+{
+    OStringStream ost;
+    ost << x;
+
+    return ost.str();
+}
+
+template<typename T>
+typename std::enable_if<std::is_enum<T>::value, std::string>::type toString(const T& x)
+{
+    OStringStream ost;
+    ost << static_cast<typename std::underlying_type<T>::type>(x);
+
+    return ost.str();
+}
+
+}
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_TOOLS_STRINGHELPER_H
+