diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-08-15 13:47:14 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-08-15 13:47:14 +0100 |
| commit | 809e35fcb53c26c8d200df805d2c57c2ac6668ef (patch) | |
| tree | 369f0ac2e6929c8fbc4c856c9b077800436ad779 | |
| parent | ce66af3d9056d2b8de6d5b2f8ce0caa100a66dec (diff) | |
Hack.
| -rw-r--r-- | src/raw_convert.cc | 9 | ||||
| -rw-r--r-- | src/raw_convert.h | 6 | ||||
| -rw-r--r-- | wscript | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/raw_convert.cc b/src/raw_convert.cc index 9be10b98..c3cce54b 100644 --- a/src/raw_convert.cc +++ b/src/raw_convert.cc @@ -99,6 +99,15 @@ dcp::raw_convert (uint64_t v, int precision, bool fixed) return make_raw (locale_convert<string> (v, precision, fixed)); } +#ifdef LIBDCP_OSX +template <> +string +dcp::raw_convert (unsigned long int v, int precision, bool fixed) +{ + return make_raw (locale_convert<string> (v, precision, fixed)); +} +#endif + template <> string dcp::raw_convert (float v, int precision, bool fixed) diff --git a/src/raw_convert.h b/src/raw_convert.h index ecae19d5..8690d524 100644 --- a/src/raw_convert.h +++ b/src/raw_convert.h @@ -77,6 +77,12 @@ template <> std::string raw_convert (uint64_t v, int, bool); +#ifdef LIBDCP_OSX +template <> +std::string +raw_convert (unsigned long int v, int, bool); +#endif + template <> std::string raw_convert (float v, int, bool); @@ -74,7 +74,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DLIBDCP_POSIX') if conf.env.TARGET_OSX: - conf.env.append_value('CXXFLAGS', ['-Wno-unused-result', '-Wno-unused-parameter', '-Wno-unused-local-typedef']) + conf.env.append_value('CXXFLAGS', ['-Wno-unused-result', '-Wno-unused-parameter', '-Wno-unused-local-typedef', '-DLIBDCP_OSX']) # Disable libxml++ deprecation warnings for now conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-declarations']) |