Add locale_convert. Reimplement raw_convert without stringstream.

1 files changed, 62 insertions, 12 deletions

diff --git a/src/raw_convert.h b/src/raw_convert.h
index 5fc05c12..b2b206b3 100644
--- a/src/raw_convert.h
+++ b/src/raw_convert.h
@@ -34,7 +34,7 @@
 #ifndef LIBDCP_RAW_CONVERT_H
 #define LIBDCP_RAW_CONVERT_H
 
-#include <locked_sstream.h>
+#include <boost/static_assert.hpp>
 #include <iomanip>
 
 namespace dcp {
@@ -46,18 +46,68 @@ template <typename P, typename Q>
 P
 raw_convert (Q v, int precision = 16, bool fixed = false)
 {
-	locked_stringstream s;
-	s.imbue (std::locale::classic ());
-	s << std::setprecision (precision);
-	if (fixed) {
-		s << std::fixed;
-	}
-	s << v;
-	P r;
-	s >> r;
-	return r;
+	/* We can't write a generic version of raw_convert; all required
+	   versions must be specialised.
+	*/
+	BOOST_STATIC_ASSERT (sizeof (Q) == 0);
 }
 
-};
+template <>
+std::string
+raw_convert (int v, int, bool);
+
+template <>
+std::string
+raw_convert (int64_t v, int, bool);
+
+template <>
+std::string
+raw_convert (uint64_t v, int, bool);
+
+template <>
+std::string
+raw_convert (float v, int, bool);
+
+template <>
+std::string
+raw_convert (double v, int, bool);
+
+template <>
+std::string
+raw_convert (char const * v, int, bool);
+
+template <>
+std::string
+raw_convert (char* v, int, bool);
+
+template <>
+std::string
+raw_convert (std::string v, int, bool);
+
+template <>
+int
+raw_convert (std::string v, int, bool);
+
+template <>
+int
+raw_convert (char const * v, int, bool);
+
+template <>
+float
+raw_convert (std::string v, int, bool);
+
+template <>
+float
+raw_convert (char const * v, int, bool);
+
+template <>
+double
+raw_convert (std::string v, int, bool);
+
+template <>
+double
+raw_convert (char const * v, int, bool);
+
+}
 
 #endif