diff options
author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2018-05-14 16:44:43 +0300 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2018-05-14 17:18:51 +0300 |
commit | 07ad29d30da44ded2bf40418b3625fecfb817399 (patch) | |
tree | 7307a4bf1cea17a60e6407269f1e49d6bdc4c2be /src/mbgl/style | |
parent | 28da56465e59702b4ae0219f1c7494a9271f6227 (diff) | |
download | qtlocation-mapboxgl-07ad29d30da44ded2bf40418b3625fecfb817399.tar.gz |
[qt] Fix build when building the Qt Location plugin
- MinGW has to explicitly know that is building a static library.
- Android doesn't have 'round' on the std:: namespace when using g++.
Diffstat (limited to 'src/mbgl/style')
-rw-r--r-- | src/mbgl/style/expression/compound_expression.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/style/expression/compound_expression.cpp b/src/mbgl/style/expression/compound_expression.cpp index c257dbf2bb..bcde09e1b6 100644 --- a/src/mbgl/style/expression/compound_expression.cpp +++ b/src/mbgl/style/expression/compound_expression.cpp @@ -364,7 +364,7 @@ std::unordered_map<std::string, CompoundExpressionRegistry::Definition> initiali return result; }); - define("round", [](double x) -> Result<double> { return std::round(x); }); + define("round", [](double x) -> Result<double> { return ::round(x); }); define("floor", [](double x) -> Result<double> { return std::floor(x); }); define("ceil", [](double x) -> Result<double> { return std::ceil(x); }); define("abs", [](double x) -> Result<double> { return std::abs(x); }); |