Skip to content

Commit

Permalink
Pull request #208: Feature/MAGP-1356 C++17
Browse files Browse the repository at this point in the history
Merge in MAG/magics from feature/MAGP-1356-C++17 to develop

* commit '422bf054f5a203528ab3681e78c7eda77f5cc7e8':
  Remove use of deprecated unary_function [MAGP-1356]
  Enforce C++17 standard [MAGP-1356]
  • Loading branch information
iainrussell authored and sylvielamythepaut committed Dec 18, 2023
2 parents a62c9d8 + 422bf05 commit 7547561
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/common/Polyline.cc
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ struct SouthCleaner {

bool operator()(PaperPoint& point) { return point.y_ < -89; }
};
struct LonFinder : std::unary_function<PaperPoint, bool> {
struct LonFinder {
LonFinder() {}

bool operator()(PaperPoint& point) const { return (same(point.x_, -180.)); }
Expand Down

0 comments on commit 7547561

Please sign in to comment.