Rationalise raw/locale_convert stuff and fix build on OS X.

5 files changed, 81 insertions, 107 deletions

diff --git a/src/compose.hpp b/src/compose.hpp
index 4ce60e33..faffc41c 100644
--- a/src/compose.hpp
+++ b/src/compose.hpp
@@ -34,6 +34,7 @@
 #ifndef STRING_COMPOSE_H
 #define STRING_COMPOSE_H
 
+#include "locale_convert.h"
 #include <boost/filesystem.hpp>
 #include <string>
 #include <list>
@@ -113,104 +114,11 @@ namespace StringPrivate
     }
   }
 
-  template <typename T>
-  inline void write(std::string& s, const T& obj)
-  {
-    /* Assume anything not specialized has a to_string() method */
-    s += to_string (obj);
-  }
-
-  template <>
-  inline void write(std::string& s, const int64_t& obj)
-  {
-    char buffer[64];
-#ifdef LIBDCP_WINDOWS
-    __mingw_snprintf(buffer, 64, "%" PRId64, obj);
-#else
-    snprintf(buffer, 64, "%" PRId64, obj);
-#endif
-    s += buffer;
-  }
-
-  template <>
-  inline void write(std::string& s, const uint64_t& obj)
-  {
-    char buffer[64];
-#ifdef LIBDCP_WINDOWS
-    __mingw_snprintf(buffer, 64, "%" PRIu64, obj);
-#else
-    snprintf(buffer, 64, "%" PRIu64, obj);
-#endif
-    s += buffer;
-  }
-
-  template <>
-  inline void write(std::string& s, const int& obj)
-  {
-    char buffer[64];
-    snprintf(buffer, 64, "%d", obj);
-    s += buffer;
-  }
-
-  template <>
-  inline void write(std::string& s, const unsigned int& obj)
-  {
-    char buffer[64];
-    snprintf(buffer, 64, "%ud", obj);
-    s += buffer;
-  }
-
-  template <>
-  inline void write(std::string& s, const float& obj)
-  {
-    char buffer[64];
-    snprintf(buffer, 64, "%f", obj);
-    s += buffer;
-  }
-
-  template <>
-  inline void write(std::string& s, const char& obj)
-  {
-    s += obj;
-  }
-
-  template <>
-  inline void write(std::string& s, const double& obj)
-  {
-    char buffer[64];
-    snprintf(buffer, 64, "%f", obj);
-    s += buffer;
-  }
-
-  template <>
-  inline void write(std::string& s, char const * const & obj)
-  {
-    s += obj;
-  }
-
-  template <>
-  inline void write(std::string& s, char* const & obj)
-  {
-    s += obj;
-  }
-
-  template <>
-  inline void write(std::string& s, const std::string& obj)
-  {
-    s += obj;
-  }
-
-  template <>
-  inline void write(std::string& s, const boost::filesystem::path & obj)
-  {
-    s += obj.string();
-  }
-
   // implementation of class Composition
   template <typename T>
   inline Composition &Composition::arg(const T &obj)
   {
-    write(os, obj);
+    os += dcp::locale_convert<std::string> (obj);
 
     if (!os.empty()) {		// manipulators don't produce output
       for (specification_map::const_iterator i = specs.lower_bound(arg_no), end = specs.upper_bound(arg_no); i != end; ++i) {
diff --git a/src/locale_convert.cc b/src/locale_convert.cc
index 3858006e..64b21274 100644
--- a/src/locale_convert.cc
+++ b/src/locale_convert.cc
@@ -51,25 +51,51 @@ string
 dcp::locale_convert (unsigned int x, int, bool)
 {
 	char buffer[64];
-	snprintf (buffer, sizeof(buffer), "%ud", x);
+	snprintf (buffer, sizeof(buffer), "%u", x);
 	return buffer;
 }
 
 template<>
 string
-dcp::locale_convert (int64_t x, int, bool)
+dcp::locale_convert (long int x, int, bool)
 {
 	char buffer[64];
-	snprintf (buffer, sizeof(buffer), "%" PRId64, x);
+	snprintf (buffer, sizeof(buffer), "%ld", x);
 	return buffer;
 }
 
 template<>
 string
-dcp::locale_convert (uint64_t x, int, bool)
+dcp::locale_convert (unsigned long int x, int, bool)
 {
 	char buffer[64];
-	snprintf (buffer, sizeof(buffer), "%" PRIu64, x);
+	snprintf (buffer, sizeof(buffer), "%lu", x);
+	return buffer;
+}
+
+template<>
+string
+dcp::locale_convert (long long int x, int, bool)
+{
+	char buffer[64];
+#ifdef LIBDCP_WINDOWS
+	__mingw_snprintf (buffer, sizeof(buffer), "%lld", x);
+#else
+	snprintf (buffer, sizeof(buffer), "%lld", x);
+#endif
+	return buffer;
+}
+
+template<>
+string
+dcp::locale_convert (unsigned long long int x, int, bool)
+{
+	char buffer[64];
+#ifdef LIBDCP_WINDOWS
+	__mingw_snprintf (buffer, sizeof(buffer), "%llu", x);
+#else
+	snprintf (buffer, sizeof(buffer), "%llu", x);
+#endif
 	return buffer;
 }
 
@@ -125,6 +151,13 @@ dcp::locale_convert (char const * x, int, bool)
 }
 
 template<>
+string
+dcp::locale_convert (boost::filesystem::path x, int, bool)
+{
+	return x.string();
+}
+
+template<>
 int
 dcp::locale_convert (string x, int, bool)
 {
diff --git a/src/locale_convert.h b/src/locale_convert.h
index f7552f68..3d55a00e 100644
--- a/src/locale_convert.h
+++ b/src/locale_convert.h
@@ -34,9 +34,9 @@
 #ifndef LIBDCP_LOCALE_CONVERT_H
 #define LIBDCP_LOCALE_CONVERT_H
 
+#include <boost/filesystem.hpp>
 #include <boost/static_assert.hpp>
 #include <string>
-#include <stdint.h>
 #include <cstdio>
 
 namespace dcp {
@@ -61,11 +61,19 @@ locale_convert (unsigned int x, int, bool);
 
 template <>
 std::string
-locale_convert (int64_t x, int, bool);
+locale_convert (long int x, int, bool);
 
 template <>
 std::string
-locale_convert (uint64_t x, int, bool);
+locale_convert (unsigned long int x, int, bool);
+
+template <>
+std::string
+locale_convert (long long int x, int, bool);
+
+template <>
+std::string
+locale_convert (unsigned long long int x, int, bool);
 
 template <>
 std::string
@@ -88,6 +96,10 @@ std::string
 locale_convert (char const * x, int, bool);
 
 template <>
+std::string
+locale_convert (boost::filesystem::path x, int, bool);
+
+template <>
 int
 locale_convert (std::string x, int, bool);
 
diff --git a/src/raw_convert.cc b/src/raw_convert.cc
index 5f8c1e41..b7685ab8 100644
--- a/src/raw_convert.cc
+++ b/src/raw_convert.cc
@@ -73,14 +73,28 @@ dcp::raw_convert (unsigned int v, int precision, bool fixed)
 
 template <>
 string
-dcp::raw_convert (int64_t v, int precision, bool fixed)
+dcp::raw_convert (long int v, int precision, bool fixed)
 {
 	return make_raw (locale_convert<string> (v, precision, fixed));
 }
 
 template <>
 string
-dcp::raw_convert (uint64_t v, int precision, bool fixed)
+dcp::raw_convert (unsigned long int v, int precision, bool fixed)
+{
+	return make_raw (locale_convert<string> (v, precision, fixed));
+}
+
+template <>
+string
+dcp::raw_convert (long long int v, int precision, bool fixed)
+{
+	return make_raw (locale_convert<string> (v, precision, fixed));
+}
+
+template <>
+string
+dcp::raw_convert (unsigned long long v, int precision, bool fixed)
 {
 	return make_raw (locale_convert<string> (v, precision, fixed));
 }
diff --git a/src/raw_convert.h b/src/raw_convert.h
index 585c18fc..901e99dd 100644
--- a/src/raw_convert.h
+++ b/src/raw_convert.h
@@ -36,7 +36,6 @@
 
 #include <boost/static_assert.hpp>
 #include <iomanip>
-#include <stdint.h>
 
 namespace dcp {
 
@@ -63,11 +62,19 @@ raw_convert (unsigned int v, int, bool);
 
 template <>
 std::string
-raw_convert (int64_t v, int, bool);
+raw_convert (long int v, int, bool);
 
 template <>
 std::string
-raw_convert (uint64_t v, int, bool);
+raw_convert (unsigned long int v, int, bool);
+
+template <>
+std::string
+raw_convert (long long int v, int, bool);
+
+template <>
+std::string
+raw_convert (unsigned long long int v, int, bool);
 
 template <>
 std::string