33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From fd3874c5e26adf26323b6a66dae2e2ffdac7fbd6 Mon Sep 17 00:00:00 2001
|
|
From: Peter Ross <pross@xvid.org>
|
|
Date: Tue, 4 May 2021 16:21:41 +1000
|
|
Subject: [PATCH 2/2] PlanetFeaturesSource: force type (gcc 10.2)
|
|
|
|
---
|
|
.../Renderable/Planet/Features/PlanetFeaturesSource.cpp | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/Skybolt/SkyboltVis/Renderable/Planet/Features/PlanetFeaturesSource.cpp b/src/Skybolt/SkyboltVis/Renderable/Planet/Features/PlanetFeaturesSource.cpp
|
|
index 22ae6ee..7e6bbba 100644
|
|
--- a/src/Skybolt/SkyboltVis/Renderable/Planet/Features/PlanetFeaturesSource.cpp
|
|
+++ b/src/Skybolt/SkyboltVis/Renderable/Planet/Features/PlanetFeaturesSource.cpp
|
|
@@ -412,7 +412,7 @@ static void addJsonTilesToTreeRecursive(FeatureTile& tile, WorldFeatures::QuadTr
|
|
tile.key.level = j["level"];
|
|
tile.key.x = j["x"];
|
|
tile.key.y = j["y"];
|
|
- tile.featureCountInFile += j["featureCount"];
|
|
+ tile.featureCountInFile += (size_t)j["featureCount"];
|
|
|
|
auto it = j.find("children");
|
|
if (it != j.end())
|
|
@@ -622,4 +622,4 @@ std::string statsToString(const std::vector<FeaturePtr>& features)
|
|
}
|
|
|
|
} // namespace mapfeatures
|
|
-} // namespace skybolt
|
|
\ No newline at end of file
|
|
+} // namespace skybolt
|
|
--
|
|
2.30.2
|
|
|