ported to C++17

melowntech · Mar 28, 2023 · fdd0f13 · fdd0f13
1 parent c21af2f
commit fdd0f13
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 13 deletions.
diff --git a/externals/buildsys/cmake b/externals/buildsys/cmake
diff --git a/externals/buildsys/common b/externals/buildsys/common
diff --git a/externals/gdal-drivers b/externals/gdal-drivers
diff --git a/externals/libgeo b/externals/libgeo
diff --git a/externals/libgeometry b/externals/libgeometry
diff --git a/externals/libimgproc b/externals/libimgproc
diff --git a/externals/libjsoncpp b/externals/libjsoncpp
diff --git a/externals/libmath b/externals/libmath
diff --git a/externals/libsemantic b/externals/libsemantic
diff --git a/externals/libservice b/externals/libservice
diff --git a/externals/libutility b/externals/libutility
diff --git a/externals/vts-libs b/externals/vts-libs
diff --git a/mapproxy/CMakeLists.txt b/mapproxy/CMakeLists.txt
@@ -4,7 +4,7 @@ enable_language(Fortran)
 project(vts-mapproxy)
 # by default, this is OSS build (can be overrided by customer machinery)
 set(BUILDSYS_DEFAULT_CUSTOMER_NAME oss)
-set(BUILDSYS_CPP_STANDARD 14)
+set(BUILDSYS_CPP_STANDARD 17)
 include(buildsys/cmake/buildsys.cmake)
 
 enable_OpenMP()

diff --git a/mapproxy/src/mapproxy/core.cpp b/mapproxy/src/mapproxy/core.cpp
@@ -171,6 +171,7 @@ void Core::generate_impl(const http::Request &request
 
 namespace {
 
+[[maybe_unused]]
 const std::string& getItem(const std::string &s)
 {
     return s;

diff --git a/mapproxy/src/mapproxy/gdalsupport/gdalsupport.cpp b/mapproxy/src/mapproxy/gdalsupport/gdalsupport.cpp
@@ -148,9 +148,13 @@ class ShRequest : boost::noncopyable, public ShRequestBase {
     void setError(Lock&, const EmptyGeoData &exc);
 
     GdalWarper::Raster getRaster(Lock &lock);
+
+    [[maybe_unused]]
     GdalWarper::Raster getRaster(bi::interprocess_mutex &mutex);
 
     GdalWarper::Heightcoded::pointer getHeightcoded(Lock &lock);
+
+    [[maybe_unused]]
     GdalWarper::Heightcoded::pointer getHeightcoded(bi::interprocess_mutex &mutex);
 
     WorkRequest::Response consumeWork(Lock &lock);

diff --git a/mapproxy/src/mapproxy/generator/tms-raster-synthetic.cpp b/mapproxy/src/mapproxy/generator/tms-raster-synthetic.cpp
@@ -336,6 +336,7 @@ namespace MetaFlags {
 
 namespace {
 
+[[maybe_unused]]
 void meta2d(const vts::TileIndex &tileIndex, const vts::TileId &tileId
             , const TmsFileInfo &fi, Sink &sink)
 {

diff --git a/mapproxy/src/mapproxy/support/mesh.cpp b/mapproxy/src/mapproxy/support/mesh.cpp
@@ -156,6 +156,7 @@ std::pair<double, double> meshArea(const geometry::Mesh &mesh)
     return res;
 }
 
+[[maybe_unused]]
 double meshArea(const geometry::Mesh &mesh, const math::Points3d &alt)
 {
     double area(0.0);
+4 −4		Modules.Conan/FindJPEG.cmake
+5 −14		Modules.Conan/FindJsonCPP.cmake
+4 −5		Modules.Conan/FindmyVRPointCloud.cmake
+1 −1		Modules.Win32/FindPowerShell.cmake
+1 −1		Modules.Win32/FindPyTorch.cmake
+1 −1		Modules/FindGeographicLib.cmake
+1 −1		Modules/FindPyTorch.cmake
+2 −1		buildsys.cmake
+4 −1		include/debian.mk
+7 −0		macros/buildsys.windows.cmake
+5 −2		macros/cuda.cmake
+40 −20		macros/install-conan-deps.cmake
+38 −16		macros/module.cmake
+7 −2		macros/python.cmake
+12 −8		macros/torch.cmake
+8 −0		manifest/windows.manifest
+1 −0		gdal-drivers/CMakeLists.txt
+4 −1		gdal-drivers/mvt.cpp
+2 −0		gdal-drivers/proto/vector_tile.proto
+1 −1		gdal-drivers/register.cpp
+1 −1		geo/CMakeLists.txt
+9 −0		geo/geodataset.cpp
+4 −0		geo/io.cpp
+6 −0		geo/srsdef.cpp
+4 −0		geo/srsdef.hpp
+1 −1		geo/test/generate.cpp
+31 −0		math/geometry.cpp
+13 −0		math/geometry.hpp
+67 −3		math/geometry_core.hpp
+44 −1		math/math.hpp
+10 −0		math/python/mathmodule.cpp
+59 −0		math/transform.hpp
+5 −0		semantic/CMakeLists.txt
+231 −9		semantic/io.cpp
+6 −0		semantic/io.hpp
+8 −0		semantic/mesh.hpp
+218 −0		semantic/mesh/lamp.cpp
+39 −0		semantic/mesh/lamp.hpp
+38 −0		semantic/mesh/mesh.incl.hpp
+2 −2		semantic/mesh/pole.cpp
+211 −0		semantic/mesh/road-features.cpp
+51 −0		semantic/mesh/road-features.hpp
+1 −1		semantic/mesh/tree.cpp
+57 −0		semantic/ogr/lamp.cpp
+38 −0		semantic/ogr/lamp.hpp
+58 −0		semantic/ogr/manhole.cpp
+38 −0		semantic/ogr/manhole.hpp
+18 −0		semantic/ogr/ogr.incl.hpp
+0 −1		semantic/ogr/pole.cpp
+1 −1		semantic/ogr/tree.cpp
+146 −3		semantic/python/semanticmodule.cpp
+1 −1		semantic/tools/semantic2obj.cpp
+8 −10		semantic/tools/semantic2vef.cpp
+5 −0		semantic/world.cpp
+178 −2		semantic/world.hpp
+10 −2		service/detail/signalhandler.cpp
+2 −0		service/detail/signalhandler.hpp
+42 −4		service/program.cpp
+1 −0		service/program.hpp
+2 −3		utility/CMakeLists.txt
+56 −0		utility/compat/optional.hpp
+2 −1		utility/cppversion.hpp
+17 −5		utility/detail/filesystem.linux.cpp
+21 −9		utility/detail/filesystem.windows.cpp
+2 −13		utility/detail/path.windows.cpp
+2 −2		utility/errorcode.hpp
+42 −6		utility/expected.hpp
+115 −5		utility/filesystem.cpp
+32 −2		utility/filesystem.hpp
+3 −1		utility/gzipper.hpp
+10 −5		utility/iothreads.cpp
+27 −2		utility/iothreads.hpp
+58 −12		utility/logging.hpp
+14 −15		utility/mysqldb.hpp
+12 −2		utility/openmp.hpp
+14 −0		utility/parse.hpp
+1 −1		utility/path-serialization.hpp
+18 −0		utility/path.cpp
+8 −5		utility/path.hpp
+110 −0		utility/serialization/optional.hpp
+55 −0		utility/std-variant.hpp
+2 −2		utility/zip.cpp
+2 −2		vts-libs/CMakeLists.txt
+2 −1		vts-libs/storage/fstreams.cpp
+3 −2		vts-libs/storage/tilar.cpp
+3 −1		vts-libs/tools-support/tmptsencoder.cpp
+9 −2		vts-libs/tools/vts.cpp
+1 −0		vts-libs/tools/vts02vts.cpp
+2 −0		vts-libs/tools/vts2vts.cpp
+2 −1		vts-libs/vts/config.cpp
+2 −0		vts-libs/vts/meshop/merge.cpp
+4 −0		vts-libs/vts/storage.hpp
+10 −1		vts-libs/vts/storage/change.cpp
+5 −0		vts-libs/vts/storage/mergeconf.cpp
+2 −0		vts-libs/vts/storage/mergeconf.hpp
+2 −0		vts-libs/vts/tileindex.cpp
+2 −0		vts-libs/vts/tileset/driver/driver.cpp
+2 −1		vts-libs/vts/tileset/tileset.cpp
+5 −0		vts-libs/vts0/merge.cpp
+2 −1		vts-libs/vts0/tileset.cpp