diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-08-06 01:15:50 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2017-01-24 11:36:59 +0200 |
| commit | 23c069d2295fe71c3cce028cec25dbc7b5d4d67d (patch) | |
| tree | 33d9ae3fbbd4e04e5dbf900e3abd0ffa8f981588 | |
| parent | 98083a0e3edaca62a83622e84cef6d769c6b0ca4 (diff) | |
| download | qtlocation-mapboxgl-23c069d2295fe71c3cce028cec25dbc7b5d4d67d.tar.gz | |
[core] Use std::to_string on Windows
Clang on Window's can't parse rapidjson's dtoa.
| -rw-r--r-- | src/mbgl/util/dtoa.cpp | 13 | ||||
| -rw-r--r-- | src/mbgl/util/dtoa.hpp | 1 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/mbgl/util/dtoa.cpp b/src/mbgl/util/dtoa.cpp index dd4fba0f89..578f844c72 100644 --- a/src/mbgl/util/dtoa.cpp +++ b/src/mbgl/util/dtoa.cpp @@ -1,10 +1,15 @@ #include "dtoa.hpp" +// Clang on Windows 64-bits can't parse rapidjson's dtoa +#if !defined(_WINDOWS) #include <rapidjson/internal/dtoa.h> +#endif namespace mbgl { namespace util { +#if !defined(_WINDOWS) + namespace { // From https://github.com/miloyip/rapidjson/blob/master/include/rapidjson/internal/dtoa.h @@ -101,5 +106,13 @@ std::string dtoa(double value) { return data; } +#else + +std::string dtoa(double value) { + return std::to_string(value); +} + +#endif + } // namespace util } // namespace mbgl diff --git a/src/mbgl/util/dtoa.hpp b/src/mbgl/util/dtoa.hpp index db7d309452..4cb81a94be 100644 --- a/src/mbgl/util/dtoa.hpp +++ b/src/mbgl/util/dtoa.hpp @@ -5,7 +5,6 @@ namespace mbgl { namespace util { -char* dtoa(double value, char* buffer); std::string dtoa(double value); } // end namespace util |