From fdd0f133d9e85be4ac2ce0838fea07155b2f1434 Mon Sep 17 00:00:00 2001 From: Vaclav Blazek Date: Tue, 28 Mar 2023 09:41:19 +0200 Subject: [PATCH] ported to C++17 --- externals/buildsys/cmake | 2 +- externals/buildsys/common | 2 +- externals/gdal-drivers | 2 +- externals/libgeo | 2 +- externals/libgeometry | 2 +- externals/libimgproc | 2 +- externals/libjsoncpp | 2 +- externals/libmath | 2 +- externals/libsemantic | 2 +- externals/libservice | 2 +- externals/libutility | 2 +- externals/vts-libs | 2 +- mapproxy/CMakeLists.txt | 2 +- mapproxy/src/mapproxy/core.cpp | 1 + mapproxy/src/mapproxy/gdalsupport/gdalsupport.cpp | 4 ++++ mapproxy/src/mapproxy/generator/tms-raster-synthetic.cpp | 1 + mapproxy/src/mapproxy/support/mesh.cpp | 1 + 17 files changed, 20 insertions(+), 13 deletions(-) diff --git a/externals/buildsys/cmake b/externals/buildsys/cmake index 4f60a68..c87deb9 160000 --- a/externals/buildsys/cmake +++ b/externals/buildsys/cmake @@ -1 +1 @@ -Subproject commit 4f60a6881fcf3cbcaab2e3a43837d34c296751c6 +Subproject commit c87deb9a6360189c5f50750e22fb5d4d8010f04e diff --git a/externals/buildsys/common b/externals/buildsys/common index c81bb04..38f6b99 160000 --- a/externals/buildsys/common +++ b/externals/buildsys/common @@ -1 +1 @@ -Subproject commit c81bb045223b907011268aa89ac3e4a0ede6ed0e +Subproject commit 38f6b99c841d10b2edb557e33cdd9f6827dcdfba diff --git a/externals/gdal-drivers b/externals/gdal-drivers index 3f4f91d..40c3292 160000 --- a/externals/gdal-drivers +++ b/externals/gdal-drivers @@ -1 +1 @@ -Subproject commit 3f4f91ddb1384dacc07243e74c5fa7ed13c2771a +Subproject commit 40c3292d406d7b3db3f8f47e0cf6de69cd7f104d diff --git a/externals/libgeo b/externals/libgeo index 8a1c9d1..248b09b 160000 --- a/externals/libgeo +++ b/externals/libgeo @@ -1 +1 @@ -Subproject commit 8a1c9d19ace93067930527aa1bff5d5d29e91ee9 +Subproject commit 248b09b99b8d19b8b520c1fd592e45e45bddba15 diff --git a/externals/libgeometry b/externals/libgeometry index 4203086..4b5cdf9 160000 --- a/externals/libgeometry +++ b/externals/libgeometry @@ -1 +1 @@ -Subproject commit 42030862cbe5882d8ee43661474208049c5877ee +Subproject commit 4b5cdf98e3e2395a55894fe45b1923d8c377eb2a diff --git a/externals/libimgproc b/externals/libimgproc index 23a8005..65306d8 160000 --- a/externals/libimgproc +++ b/externals/libimgproc @@ -1 +1 @@ -Subproject commit 23a8005c98c637ba5c60bdaf8e112fd4fcc510df +Subproject commit 65306d8471b61bc9757e36754ea29fefb39150e5 diff --git a/externals/libjsoncpp b/externals/libjsoncpp index b4076c4..4c05a79 160000 --- a/externals/libjsoncpp +++ b/externals/libjsoncpp @@ -1 +1 @@ -Subproject commit b4076c43dbd391be82b9b8b6b1dd28ba16993a4d +Subproject commit 4c05a7999ebda94d02780995ee50555bbec76c13 diff --git a/externals/libmath b/externals/libmath index a5cb7fa..d88f4a1 160000 --- a/externals/libmath +++ b/externals/libmath @@ -1 +1 @@ -Subproject commit a5cb7fa7e7ec2ca76bc93f95b4bd604f90e68f5b +Subproject commit d88f4a1a140f686ed541c27dcddcd0b53cd875fd diff --git a/externals/libsemantic b/externals/libsemantic index 1c8a52e..e1e13cb 160000 --- a/externals/libsemantic +++ b/externals/libsemantic @@ -1 +1 @@ -Subproject commit 1c8a52e42d0282481180f88df354df4f30b87a4e +Subproject commit e1e13cb6a8a79fe36c663c73945cfc367aa17869 diff --git a/externals/libservice b/externals/libservice index c79675c..1c867fb 160000 --- a/externals/libservice +++ b/externals/libservice @@ -1 +1 @@ -Subproject commit c79675c2aaa27bbd3dbefbb4640f83e0a3127f3d +Subproject commit 1c867fb1a8f0c0010c34f4ad1bb1b55ea8ae1440 diff --git a/externals/libutility b/externals/libutility index 451296d..8c1b1d9 160000 --- a/externals/libutility +++ b/externals/libutility @@ -1 +1 @@ -Subproject commit 451296d0f8c9d0c372cce77d28bbaa74f266ab74 +Subproject commit 8c1b1d9e835c8b45f5bd6c6d9e3aca8e2a8d69b7 diff --git a/externals/vts-libs b/externals/vts-libs index 67399ac..8e19c4a 160000 --- a/externals/vts-libs +++ b/externals/vts-libs @@ -1 +1 @@ -Subproject commit 67399ac4b37778e0d374f665f1c4075c0a0aba7d +Subproject commit 8e19c4ab995effe8f3c03af183f23328c4c4faa5 diff --git a/mapproxy/CMakeLists.txt b/mapproxy/CMakeLists.txt index 99af5b4..79a06a5 100644 --- 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 index b017a9f..a816c57 100644 --- 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 index ca62470..11b094e 100644 --- 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 index 70645b8..cd6d942 100644 --- 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 index aeba0f7..c5ebcba 100644 --- a/mapproxy/src/mapproxy/support/mesh.cpp +++ b/mapproxy/src/mapproxy/support/mesh.cpp @@ -156,6 +156,7 @@ std::pair meshArea(const geometry::Mesh &mesh) return res; } +[[maybe_unused]] double meshArea(const geometry::Mesh &mesh, const math::Points3d &alt) { double area(0.0);