Fixes for GCC 13 and LLVM 17 (#1749)

This commit is contained in:
Tadej Novak
2023-10-14 10:48:59 +02:00
committed by GitHub
parent 89b9c3945c
commit a3e3290d68
9 changed files with 118 additions and 42 deletions

View File

@@ -314,12 +314,12 @@ RenderTiles RenderTileSource::getRenderTiles() const {
RenderTiles RenderTileSource::getRenderTilesSortedByYPosition() const {
if (!renderTilesSortedByY) {
const auto comp = [bearing = this->bearing](const RenderTile& a, const RenderTile& b) {
const auto comp = [sourceBearing = this->bearing](const RenderTile& a, const RenderTile& b) {
Point<float> pa(static_cast<float>(a.id.canonical.x), static_cast<float>(a.id.canonical.y));
Point<float> pb(static_cast<float>(b.id.canonical.x), static_cast<float>(b.id.canonical.y));
auto par = util::rotate(pa, bearing);
auto pbr = util::rotate(pb, bearing);
auto par = util::rotate(pa, sourceBearing);
auto pbr = util::rotate(pb, sourceBearing);
return std::tie(b.id.canonical.z, par.y, par.x) < std::tie(a.id.canonical.z, pbr.y, pbr.x);
};

View File

@@ -12,7 +12,7 @@ std::optional<TransitionOptions> Converter<TransitionOptions>::operator()(const
return std::nullopt;
}
std::optional<TransitionOptions> result = TransitionOptions{};
auto result = TransitionOptions{};
auto duration = objectMember(value, "duration");
if (duration) {
@@ -21,7 +21,7 @@ std::optional<TransitionOptions> Converter<TransitionOptions>::operator()(const
error.message = "duration must be a number";
return std::nullopt;
}
result->duration = {std::chrono::milliseconds(int64_t(*number))};
result.duration = {std::chrono::milliseconds(int64_t(*number))};
}
auto delay = objectMember(value, "delay");
@@ -31,10 +31,10 @@ std::optional<TransitionOptions> Converter<TransitionOptions>::operator()(const
error.message = "delay must be a number";
return std::nullopt;
}
result->delay = {std::chrono::milliseconds(int64_t(*number))};
result.delay = {std::chrono::milliseconds(int64_t(*number))};
}
return result;
return std::make_optional(std::move(result));
}
} // namespace conversion

View File

@@ -26,7 +26,10 @@ class GeoJSONVTData final : public GeoJSONData {
void getTile(const CanonicalTileID& id, const std::function<void(TileFeatures)>& fn) final {
assert(fn);
scheduler->scheduleAndReplyValue(
[id, impl = this->impl]() -> TileFeatures { return impl->getTile(id.z, id.x, id.y).features; }, fn);
[id, geoJSONVT_impl = this->impl]() -> TileFeatures {
return geoJSONVT_impl->getTile(id.z, id.x, id.y).features;
},
fn);
}
Features getChildren(const std::uint32_t) final { return {}; }