summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2017-11-27 18:41:04 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2017-11-27 15:54:17 -0200
commitd8bcc943c50b1030f8b090d28b023ff7c40afd9c (patch)
treeec83b47b85260f2be6a2369322f64aa2e8d80a0d /src
parent02166a1802a5c17f5b0cebc5ea57f70aee4172ec (diff)
downloadqtlocation-mapboxgl-d8bcc943c50b1030f8b090d28b023ff7c40afd9c.tar.gz
[core] Android + old libstdc++ build fix
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/text/placement.cpp2
-rw-r--r--src/mbgl/tile/custom_geometry_tile.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp
index 9284e213c2..e363d7bc03 100644
--- a/src/mbgl/text/placement.cpp
+++ b/src/mbgl/text/placement.cpp
@@ -15,7 +15,7 @@ OpacityState::OpacityState(bool placed_, bool offscreen)
}
OpacityState::OpacityState(const OpacityState& prevState, float increment, bool placed_) :
- opacity(std::fmax(0, std::fmin(1, prevState.opacity + (prevState.placed ? increment : -increment)))),
+ opacity(::fmax(0, ::fmin(1, prevState.opacity + (prevState.placed ? increment : -increment)))),
placed(placed_) {}
bool OpacityState::isHidden() const {
diff --git a/src/mbgl/tile/custom_geometry_tile.cpp b/src/mbgl/tile/custom_geometry_tile.cpp
index 0d0ff5be61..b608d90d83 100644
--- a/src/mbgl/tile/custom_geometry_tile.cpp
+++ b/src/mbgl/tile/custom_geometry_tile.cpp
@@ -4,6 +4,7 @@
#include <mbgl/renderer/tile_parameters.hpp>
#include <mbgl/actor/scheduler.hpp>
#include <mbgl/style/filter_evaluator.hpp>
+#include <mbgl/util/string.hpp>
#include <mapbox/geojsonvt.hpp>
@@ -33,7 +34,7 @@ void CustomGeometryTile::setTileData(const GeoJSON& geoJSON) {
mapbox::geojsonvt::TileOptions vtOptions;
vtOptions.extent = util::EXTENT;
- vtOptions.buffer = std::round(scale * options.buffer);
+ vtOptions.buffer = ::round(scale * options.buffer);
vtOptions.tolerance = scale * options.tolerance;
featureData = mapbox::geojsonvt::geoJSONToTile(geoJSON, id.canonical.z, id.canonical.x, id.canonical.y, vtOptions).features;
} else {