summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <thiago@mapbox.com>2016-08-06 01:15:50 +0300
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2017-07-10 17:13:10 +0300
commita4ed75ce510ef3eabc784209595c5d4a9ebba488 (patch)
treea892f557492b186cbee19d8693b253a2b409ad66
parentc4a2907183efb51a2885a36f49a642a3d88859c5 (diff)
downloadqtlocation-mapboxgl-a4ed75ce510ef3eabc784209595c5d4a9ebba488.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.cpp13
-rw-r--r--src/mbgl/util/dtoa.hpp1
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