Tidying.

[libdcp.git] / src / raw_convert.h

diff --git a/src/raw_convert.h b/src/raw_convert.h
index 5fc05c12257e3d65204c69dfde971d063eadf39b..dff860e9a2414810b9b17f329f12063f9761a295 100644 (file)
--- a/src/raw_convert.h
+++ b/src/raw_convert.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,33 +31,149 @@
     files in the program, then also delete it here.
 */
 
+
+/** @file  src/raw_convert.h
+ *  @brief Methods for conversion to/from string
+ */
+
+
 #ifndef LIBDCP_RAW_CONVERT_H
 #define LIBDCP_RAW_CONVERT_H
 
-#include <locked_sstream.h>
+
+#include "util.h"
+#include <boost/static_assert.hpp>
 #include <iomanip>
 
+
 namespace dcp {
 
+
 /** A sort-of version of boost::lexical_cast that does uses the "C"
  *  locale (i.e. no thousands separators and a . for the decimal separator).
  */
 template <typename P, typename Q>
 P
-raw_convert (Q v, int precision = 16, bool fixed = false)
+raw_convert (Q, 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);
+       LIBDCP_UNUSED(precision);
+       LIBDCP_UNUSED(fixed);
+}
+
+template <>
+std::string
+raw_convert (unsigned char v, int, bool);
+
+template <>
+std::string
+raw_convert (unsigned short int v, int, bool);
+
+template <>
+std::string
+raw_convert (int v, int, bool);
+
+template <>
+std::string
+raw_convert (unsigned int v, int, bool);
+
+template <>
+std::string
+raw_convert (long v, int, bool);
+
+template <>
+std::string
+raw_convert (unsigned long v, int, bool);
+
+template <>
+std::string
+raw_convert (long long v, int, bool);
+
+template <>
+std::string
+raw_convert (unsigned long long 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 <>
+std::string
+raw_convert (wchar_t const * v, int, bool);
+
+template <>
+std::string
+raw_convert (char v, int, bool);
+
+template <>
+unsigned char
+raw_convert (std::string v, int, bool);
+
+template <>
+unsigned short int
+raw_convert (std::string v, int, bool);
+
+template <>
+int
+raw_convert (std::string v, int, bool);
+
+template <>
+long
+raw_convert (std::string v, int, bool);
+
+template <>
+unsigned long
+raw_convert (std::string v, int, bool);
+
+template <>
+long long
+raw_convert (std::string v, int, bool);
+
+template <>
+unsigned long long
+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