diff options
author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-08-06 01:15:50 +0300 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-07-12 15:13:33 +0300 |
commit | 0d7d3d895955dcf6f852b8eba8b146f7dddad529 (patch) | |
tree | 5a58c5aa453d0bcd4594beda1050cb79c75910c1 /src | |
parent | 3b49ec3a0b4bab40ddb9a2a9789e787089870c93 (diff) | |
download | qtlocation-mapboxgl-0d7d3d895955dcf6f852b8eba8b146f7dddad529.tar.gz |
[core] Use std::to_string on Windows
Clang on Window's can't parse rapidjson's dtoa.
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/util/dtoa.cpp | 14 | ||||
-rw-r--r-- | src/mbgl/util/dtoa.hpp | 1 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/mbgl/util/dtoa.cpp b/src/mbgl/util/dtoa.cpp index dd4fba0f89..6ca3e19c3d 100644 --- a/src/mbgl/util/dtoa.cpp +++ b/src/mbgl/util/dtoa.cpp @@ -1,10 +1,16 @@ #include "dtoa.hpp" +// Clang/C2 on Windows 64-bits can't parse rapidjson's dtoa +// and it was causing the compiler to crash. +#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 +107,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 |