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);
};