From b80f65a2f7cf3e8a02fe0ad8bebb19640f63b5d2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 11 Aug 2016 14:12:51 +0100 Subject: Add locale_convert. Reimplement raw_convert without stringstream. --- src/raw_convert.h | 74 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 62 insertions(+), 12 deletions(-) (limited to 'src/raw_convert.h') 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 +#include #include namespace dcp { @@ -46,18 +46,68 @@ template 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 -- cgit v1.2.3