tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for Xcode 12 and new version of C++ compiler

Browse Source
This commit is contained in:
Petr Pokorny
2020-12-16 18:13:33 +01:00
parent 2e4ac4e397
commit 4b7b90378e
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mapbox-gl-native-ios/platform/ios/ios.xcodeproj/project.pbxproj
View File

@@ -3823,6 +3823,7 @@
CURRENT_PROJECT_VERSION = 15256;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_TESTABILITY = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
@@ -3847,6 +3848,7 @@
CURRENT_PROJECT_VERSION = 15256;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
GCC_PREPROCESSOR_DEFINITIONS = "";
"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;

4
mapbox-gl-native/include/mbgl/util/indexed_tuple.hpp
View File

@@ -30,12 +30,12 @@ public:
template <class I>
auto& get() {
return std::get<TypeIndex<I, Is...>::value, Ts...>(*this);
return std::get<TypeIndex<I, Is...>::value>(*this);
}
template <class I>
const auto& get() const {
return std::get<TypeIndex<I, Is...>::value, Ts...>(*this);
return std::get<TypeIndex<I, Is...>::value>(*this);
}
template <class... Us>

2
mapbox-gl-native/src/mbgl/style/expression/within.cpp
View File

@@ -39,7 +39,7 @@ Polygon<int64_t> getTilePolygon(const Polygon<double>& polygon,
for (const auto& ring : polygon) {
LinearRing<int64_t> temp;
temp.reserve(ring.size());
for (const auto p : ring) {
for (const auto& p : ring) {
const auto coord = latLonToTileCoodinates(p, canonical);
temp.push_back(coord);
updateBBox(bbox, coord);

10
mapbox-gl-native/src/mbgl/tile/geometry_tile_data.cpp
View File

@@ -198,7 +198,7 @@ GeometryCollection convertGeometry(const Feature::geometry_type& geometryTileFea
[&](const MultiPoint<double>& points) -> GeometryCollection {
MultiPoint<int16_t> result;
result.reserve(points.size());
for (const auto p : points) {
for (const auto& p : points) {
result.emplace_back(latLonToTileCoodinates(p));
}
return {std::move(result)};
@@ -206,7 +206,7 @@ GeometryCollection convertGeometry(const Feature::geometry_type& geometryTileFea
[&](const LineString<double>& lineString) -> GeometryCollection {
LineString<int16_t> result;
result.reserve(lineString.size());
for (const auto p : lineString) {
for (const auto& p : lineString) {
result.emplace_back(latLonToTileCoodinates(p));
}
return {std::move(result)};
@@ -217,7 +217,7 @@ GeometryCollection convertGeometry(const Feature::geometry_type& geometryTileFea
for (const auto& line : lineStrings) {
LineString<int16_t> temp;
temp.reserve(line.size());
for (const auto p : line) {
for (const auto& p : line) {
temp.emplace_back(latLonToTileCoodinates(p));
}
result.emplace_back(temp);
@@ -230,7 +230,7 @@ GeometryCollection convertGeometry(const Feature::geometry_type& geometryTileFea
for (const auto& ring : polygon) {
LinearRing<int16_t> temp;
temp.reserve(ring.size());
for (const auto p : ring) {
for (const auto& p : ring) {
temp.emplace_back(latLonToTileCoodinates(p));
}
result.emplace_back(temp);
@@ -244,7 +244,7 @@ GeometryCollection convertGeometry(const Feature::geometry_type& geometryTileFea
for (const auto& r : pg) {
LinearRing<int16_t> ring;
ring.reserve(r.size());
for (const auto p : r) {
for (const auto& p : r) {
ring.emplace_back(latLonToTileCoodinates(p));
}
result.emplace_back(ring);