summaryrefslogtreecommitdiff
path: root/include/llmr/map
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-05-14 16:40:24 +0200
committerKonstantin Käfer <mail@kkaefer.com>2014-05-14 16:40:24 +0200
commitb167a79c22ed3e65941305a7d8e0fedb796dd11f (patch)
treed18abbec96b0b12eb26d809b5b9abdc7b305c37c /include/llmr/map
parentb8d88600b81372a7544ebe420c562c4fa02592e9 (diff)
downloadqtlocation-mapboxgl-b167a79c22ed3e65941305a7d8e0fedb796dd11f.tar.gz
always use std:: namespace for math functions
fixes #201
Diffstat (limited to 'include/llmr/map')
-rw-r--r--include/llmr/map/tile.hpp2
-rw-r--r--include/llmr/map/transform.hpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/llmr/map/tile.hpp b/include/llmr/map/tile.hpp
index 76a01e04e8..0f43f9df2b 100644
--- a/include/llmr/map/tile.hpp
+++ b/include/llmr/map/tile.hpp
@@ -33,7 +33,7 @@ public:
: w((x < 0 ? x - (1 << z) + 1 : x) / (1 << z)), z(z), x(x), y(y) {}
inline uint64_t to_uint64() const {
- return ((pow(2, z) * y + x) * 32) + z;
+ return ((std::pow(2, z) * y + x) * 32) + z;
}
inline operator std::string() const {
diff --git a/include/llmr/map/transform.hpp b/include/llmr/map/transform.hpp
index 6b43521309..472d01ab7e 100644
--- a/include/llmr/map/transform.hpp
+++ b/include/llmr/map/transform.hpp
@@ -81,8 +81,8 @@ private:
// Limit the amount of zooming possible on the map.
// TODO: make these modifiable from outside.
- const double min_scale = pow(2, 0);
- const double max_scale = pow(2, 20);
+ const double min_scale = std::pow(2, 0);
+ const double max_scale = std::pow(2, 20);
// cache values for spherical mercator math
double zc, Bc, Cc;