From 3625e9304b838715eec5d0662c67e36d162df0e0 Mon Sep 17 00:00:00 2001 From: Remek Zajac Date: Thu, 18 Jun 2020 01:50:30 +0200 Subject: [PATCH] fix windows --- src/Terrain/TerrainQuery.cc | 8 ++++---- src/Terrain/TerrainQuery.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Terrain/TerrainQuery.cc b/src/Terrain/TerrainQuery.cc index 613b30a5c..7ed3105db 100644 --- a/src/Terrain/TerrainQuery.cc +++ b/src/Terrain/TerrainQuery.cc @@ -813,7 +813,7 @@ const UnitTestTerrainQuery::Flat10Region UnitTestTerrainQuery::flat10Region{{ pointNemo.longitude() + UnitTestTerrainQuery::regionExtentDeg } }}; -const double UnitTestTerrainQuery::Flat10Region::elevationMts; +const double UnitTestTerrainQuery::Flat10Region::elevationMts = 10; const UnitTestTerrainQuery::LinearSlopeRegion UnitTestTerrainQuery::linearSlopeRegion{{ flat10Region.topRight(), @@ -822,9 +822,9 @@ const UnitTestTerrainQuery::LinearSlopeRegion UnitTestTerrainQuery::linearSlopeR flat10Region.topRight().longitude() + UnitTestTerrainQuery::regionExtentDeg } }}; -const double UnitTestTerrainQuery::LinearSlopeRegion::minElevationMts; -const double UnitTestTerrainQuery::LinearSlopeRegion::maxElevationMts; -const double UnitTestTerrainQuery::LinearSlopeRegion::dElevationMts; +const double UnitTestTerrainQuery::LinearSlopeRegion::minElevationMts = -100; +const double UnitTestTerrainQuery::LinearSlopeRegion::maxElevationMts = 1000; +const double UnitTestTerrainQuery::LinearSlopeRegion::dElevationMts = maxElevationMts-minElevationMts; UnitTestTerrainQuery::UnitTestTerrainQuery(TerrainQueryInterface* parent) :TerrainQueryInterface(parent) diff --git a/src/Terrain/TerrainQuery.h b/src/Terrain/TerrainQuery.h index 1bb350a19..c9da0af0c 100644 --- a/src/Terrain/TerrainQuery.h +++ b/src/Terrain/TerrainQuery.h @@ -319,7 +319,7 @@ public: :QGeoRectangle(region) {} - static constexpr double elevationMts = 10; + static const double elevationMts; }; static const Flat10Region flat10Region; @@ -331,9 +331,9 @@ public: :QGeoRectangle(region) {} - static constexpr double minElevationMts = -100; - static constexpr double maxElevationMts = 1000; - static constexpr double dElevationMts = maxElevationMts-minElevationMts; + static const double minElevationMts; + static const double maxElevationMts; + static const double dElevationMts; }; static const LinearSlopeRegion linearSlopeRegion; -- 2.22.0