From acd95c325afaf09976400d86733d26b83f28542f Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Mon, 24 Jul 2017 15:36:02 +0300 Subject: [core] Fix issues with the std:: namespace and old compilers Specifically when building Android with GCC 4.9 (which Qt still does :-/) --- src/mbgl/text/shaping.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/mbgl/text') 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 #include +#include 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; } -- cgit v1.2.1