From 3ff57ab81833b55c5afd21d6780050bcf445245b Mon Sep 17 00:00:00 2001 From: Stephen Herbener Date: Thu, 1 Sep 2022 14:05:59 -0600 Subject: [PATCH] Enable the C++14 standard for C++ compiles. --- cmake/compiler_flags_Clang_CXX.cmake | 2 +- cmake/compiler_flags_GNU_CXX.cmake | 2 +- cmake/compiler_flags_Intel_CXX.cmake | 2 +- tools/bufr/print_queries.cpp | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/compiler_flags_Clang_CXX.cmake b/cmake/compiler_flags_Clang_CXX.cmake index 44b7dd9bf..661dd5850 100644 --- a/cmake/compiler_flags_Clang_CXX.cmake +++ b/cmake/compiler_flags_Clang_CXX.cmake @@ -7,7 +7,7 @@ # FLAGS COMMON TO ALL BUILD TYPES #################################################################### -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wno-c++11-extensions") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14 -g -Wall -Wno-c++11-extensions") #################################################################### # RELEASE FLAGS diff --git a/cmake/compiler_flags_GNU_CXX.cmake b/cmake/compiler_flags_GNU_CXX.cmake index 716544fac..73dc5f45a 100644 --- a/cmake/compiler_flags_GNU_CXX.cmake +++ b/cmake/compiler_flags_GNU_CXX.cmake @@ -7,7 +7,7 @@ # FLAGS COMMON TO ALL BUILD TYPES #################################################################### -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wno-deprecated-declarations") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14 -g -Wall -Wno-deprecated-declarations") #################################################################### # RELEASE FLAGS diff --git a/cmake/compiler_flags_Intel_CXX.cmake b/cmake/compiler_flags_Intel_CXX.cmake index 484df8ac0..90844ba02 100644 --- a/cmake/compiler_flags_Intel_CXX.cmake +++ b/cmake/compiler_flags_Intel_CXX.cmake @@ -7,7 +7,7 @@ # FLAGS COMMON TO ALL BUILD TYPES #################################################################### -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -traceback") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14 -g -traceback") #################################################################### # RELEASE FLAGS diff --git a/tools/bufr/print_queries.cpp b/tools/bufr/print_queries.cpp index 71ea25af0..bc30f9acd 100644 --- a/tools/bufr/print_queries.cpp +++ b/tools/bufr/print_queries.cpp @@ -34,10 +34,10 @@ std::set getSubsets(int fileUnit) } -std::vector > +std::vector> getDimPaths(const std::vector& queryData) { - std::map > dimPathMap; + std::map> dimPathMap; for (auto& query : queryData) { std::stringstream pathStream; @@ -52,7 +52,7 @@ getDimPaths(const std::vector& queryData) pathStream.str()); } - std::vector > result; + std::vector> result; for (auto& dimPath : dimPathMap) { result.push_back(dimPath.second); @@ -120,7 +120,7 @@ std::string dimStyledStr(int dims) return ostr.str(); } -void printDimPaths(std::vector > dimPaths) +void printDimPaths(std::vector> dimPaths) { for (auto& dimPath : dimPaths) {