diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2015-08-03 15:01:35 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2015-08-04 14:08:19 +0200 |
commit | 78ec33320ff5837f23e85e336716692f63fd0254 (patch) | |
tree | de48fe425d31e2378cc02544d97e981600c4dc61 /src/mbgl/platform | |
parent | ab7456075c7744c8528c2b86cfa77f80d6a04ef1 (diff) | |
download | qtlocation-mapboxgl-78ec33320ff5837f23e85e336716692f63fd0254.tar.gz |
don't use certain STL functions
some functions defined in <cmath>, as well as std::to_string aren't available on GNU's STL for some platforms, e.g. Android
Diffstat (limited to 'src/mbgl/platform')
-rw-r--r-- | src/mbgl/platform/gl.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/platform/log.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mbgl/platform/gl.cpp b/src/mbgl/platform/gl.cpp index 76be580b91..d387f3fbf8 100644 --- a/src/mbgl/platform/gl.cpp +++ b/src/mbgl/platform/gl.cpp @@ -1,4 +1,5 @@ #include <mbgl/platform/gl.hpp> +#include <mbgl/util/string.hpp> #include <mutex> @@ -51,7 +52,7 @@ void checkError(const char *cmd, const char *file, int line) { default: error = "(unknown)"; break; } - throw ::mbgl::gl::Error(err, std::string(cmd) + ": Error GL_" + error + " - " + file + ":" + std::to_string(line)); + throw ::mbgl::gl::Error(err, std::string(cmd) + ": Error GL_" + error + " - " + file + ":" + util::toString(line)); } } diff --git a/src/mbgl/platform/log.cpp b/src/mbgl/platform/log.cpp index eec33444b9..6daed40888 100644 --- a/src/mbgl/platform/log.cpp +++ b/src/mbgl/platform/log.cpp @@ -2,6 +2,7 @@ #include <mbgl/util/thread_context.hpp> +#include <cstdio> #include <cstdarg> #include <sstream> |