From f05a2c0c48cc3d1abc5cf16e770775c9dc6830a6 Mon Sep 17 00:00:00 2001 From: Iain Russell Date: Mon, 3 Apr 2023 13:37:48 +0100 Subject: [PATCH 1/2] Enforce C++17 standard [MAGP-1356] --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d77c2ec8..6adb4786 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ set(INSTALL_INCLUDE_DIR include/magics CACHE PATH "Magics installation directory include(ecbuild_system NO_POLICY_SCOPE) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_C_STANDARD 99) From 422bf054f5a203528ab3681e78c7eda77f5cc7e8 Mon Sep 17 00:00:00 2001 From: Iain Russell Date: Mon, 3 Apr 2023 13:38:23 +0100 Subject: [PATCH 2/2] Remove use of deprecated unary_function [MAGP-1356] --- src/common/Polyline.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/Polyline.cc b/src/common/Polyline.cc index 76a117cf..836697da 100644 --- a/src/common/Polyline.cc +++ b/src/common/Polyline.cc @@ -107,7 +107,7 @@ struct SouthCleaner { bool operator()(PaperPoint& point) { return point.y_ < -89; } }; -struct LonFinder : std::unary_function { +struct LonFinder { LonFinder() {} bool operator()(PaperPoint& point) const { return (same(point.x_, -180.)); }