summaryrefslogtreecommitdiff
path: root/src/mbgl/text/shaping.cpp
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2017-07-24 15:36:02 +0300
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2017-07-26 18:51:11 +0300
commitacd95c325afaf09976400d86733d26b83f28542f (patch)
tree033ae91c626ffc99bc0527fd5878fed484016131 /src/mbgl/text/shaping.cpp
parentcb5f498dfeb0ec0ef86ac027b29cce6f2037fd3e (diff)
downloadqtlocation-mapboxgl-acd95c325afaf09976400d86733d26b83f28542f.tar.gz
[core] Fix issues with the std:: namespace and old compilers
Specifically when building Android with GCC 4.9 (which Qt still does :-/)
Diffstat (limited to 'src/mbgl/text/shaping.cpp')
-rw-r--r--src/mbgl/text/shaping.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mbgl/text/shaping.cpp b/src/mbgl/text/shaping.cpp
index c81f25d4eb..6c7ecff42a 100644
--- a/src/mbgl/text/shaping.cpp
+++ b/src/mbgl/text/shaping.cpp
@@ -7,6 +7,7 @@
#include <boost/algorithm/string.hpp>
#include <algorithm>
+#include <cmath>
namespace mbgl {
@@ -72,7 +73,7 @@ float determineAverageLineWidth(const std::u16string& logicalInput,
}
}
- int32_t targetLineCount = std::fmax(1, std::ceil(totalWidth / maxWidth));
+ int32_t targetLineCount = ::fmax(1, std::ceil(totalWidth / maxWidth));
return totalWidth / targetLineCount;
}