Bump C++ standard from C++17 to C++20.

* Use a more CMake-like way to set the C++ standard. * Various IWYU fixes. * clang-tidy fix to use std::ranges! * We need to adapt our code a tiny bit to avoid using an operator<< which got deleted in C++20, see: https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p1423r3.html#option7 * Kicked out a few old compilers from our home-grown auto-detection which are definitely not usable anymore. Change-Id: I66258c961de3b8c9fd4c04a8408abb5f8eee0db2
sebastianliebscher · Aug 18, 2023 · ce95ecb · ce95ecb
1 parent ee5939a
commit ce95ecb
Show file tree

Hide file tree

Showing 30 changed files with 72 additions and 53 deletions.
diff --git a/packages/livestatus/CMakeLists.txt b/packages/livestatus/CMakeLists.txt
@@ -1,8 +1,14 @@
 cmake_minimum_required(VERSION 3.24)
 
+set(root_repo_dir ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(PLANTUTML_VERSION 1.2022.13)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_COMPILER g++-13) # TODO: replace with more intelligent approach
-set(root_repo_dir ${CMAKE_CURRENT_SOURCE_DIR}/../..)
+
 add_compile_options(
   -Wall
   -Wextra
@@ -12,7 +18,6 @@ add_compile_options(
   -DASIO_NO_DEPRECATED
   -fPIC
   -gdwarf-4
-  -std=c++17
   -O3)
 
 project(
@@ -21,6 +26,5 @@ project(
   DESCRIPTION "Livestatus library"
   LANGUAGES CXX)
 
-# SUB-DIRS:
 add_subdirectory(src)
 add_subdirectory(test)
diff --git a/packages/livestatus/doc/Doxyfile b/packages/livestatus/doc/Doxyfile
@@ -1171,7 +1171,7 @@ CLANG_ADD_INC_PATHS    = YES
 # specified with INPUT and INCLUDE_PATH.
 # This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
 
-CLANG_OPTIONS          = -std=c++17 \
+CLANG_OPTIONS          = -std=c++20 \
                          -Iinclude \
                          -Ibuild/_deps/asio-omd-src/include \
                          -Ibuild/_deps/re2-src \

diff --git a/packages/livestatus/include/livestatus/Renderer.h b/packages/livestatus/include/livestatus/Renderer.h
@@ -7,6 +7,7 @@
 #define Renderer_h
 
 #include <chrono>
+#include <compare>
 #include <cstdint>
 #include <iomanip>
 #include <iosfwd>

diff --git a/packages/livestatus/src/AttributeListColumn.cc b/packages/livestatus/src/AttributeListColumn.cc
@@ -5,6 +5,7 @@
 
 #include "livestatus/AttributeListColumn.h"
 
+#include <algorithm>
 #include <bitset>
 #include <cctype>
 #include <map>

diff --git a/packages/livestatus/src/Column.cc b/packages/livestatus/src/Column.cc
@@ -5,6 +5,7 @@
 
 #include "livestatus/Column.h"
 
+#include <algorithm>
 #include <utility>
 
 Column::Column(std::string name, std::string description, ColumnOffsets offsets)

diff --git a/packages/livestatus/src/DictFilter.cc b/packages/livestatus/src/DictFilter.cc
@@ -6,6 +6,7 @@
 #include "livestatus/DictFilter.h"
 
 #include <algorithm>
+#include <compare>
 #include <cstddef>
 #include <tuple>
 #include <unordered_map>

diff --git a/packages/livestatus/src/InputBuffer.cc b/packages/livestatus/src/InputBuffer.cc
@@ -7,8 +7,10 @@
 
 #include <unistd.h>
 
+#include <algorithm>
 #include <cctype>
 #include <cerrno>
+#include <compare>
 #include <cstring>
 #include <ostream>
 #include <string_view>

diff --git a/packages/livestatus/src/LogCache.cc b/packages/livestatus/src/LogCache.cc
@@ -5,7 +5,10 @@
 
 #include "livestatus/LogCache.h"
 
+#include <algorithm>
+#include <compare>
 #include <iterator>
+#include <ranges>
 #include <system_error>
 
 #include "livestatus/ICore.h"
@@ -79,8 +82,8 @@ LogCache::pathsSince(std::chrono::system_clock::time_point since) {
     update();
     std::vector<std::filesystem::path> paths;
     bool horizon_reached{false};
-    for (auto it = _logfiles.crbegin(); it != _logfiles.crend(); ++it) {
-        const auto &[unused, log_file] = *it;
+    for (const auto &[unused, log_file] :
+         std::ranges::reverse_view(_logfiles)) {
         if (horizon_reached) {
             return {paths, log_file->path()};
         }

diff --git a/packages/livestatus/src/Logfile.cc b/packages/livestatus/src/Logfile.cc
@@ -9,6 +9,7 @@
 
 #include <algorithm>
 #include <cerrno>
+#include <compare>
 #include <sstream>
 #include <stdexcept>
 #include <vector>

diff --git a/packages/livestatus/src/POSIXUtils.cc b/packages/livestatus/src/POSIXUtils.cc
@@ -17,6 +17,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
+#include <compare>
 #include <ratio>
 #include <thread>
 

diff --git a/packages/livestatus/src/ParsedQuery.cc b/packages/livestatus/src/ParsedQuery.cc
@@ -8,6 +8,7 @@
 #include <algorithm>
 #include <cctype>
 #include <cmath>
+#include <compare>
 #include <cstdint>
 #include <cstdlib>
 #include <map>

diff --git a/packages/livestatus/src/Query.cc b/packages/livestatus/src/Query.cc
@@ -5,7 +5,9 @@
 
 #include "livestatus/Query.h"
 
+#include <algorithm>
 #include <cassert>
+#include <compare>
 #include <sstream>
 #include <utility>
 

diff --git a/packages/livestatus/src/Renderer.cc b/packages/livestatus/src/Renderer.cc
@@ -46,13 +46,14 @@ void Renderer::output(double value) {
 void Renderer::output(const RowFragment &value) { _os << value._str; }
 
 void Renderer::outputUnicodeChar(char32_t value) {
-    if (value < 0x10000U) {
-        outputHex('u', 4, value);
+    const uint_least32_t number{value};
+    if (number < 0x10000U) {
+        outputHex('u', 4, number);
     } else if (useSurrogatePairs()) {
-        outputHex('u', 4, 0xd800U | (((value - 0x10000U) >> 10) & 0x3ffU));
-        outputHex('u', 4, 0xdc00U | ((value - 0x10000U) & 0x3ffU));
+        outputHex('u', 4, 0xd800U | (((number - 0x10000U) >> 10) & 0x3ffU));
+        outputHex('u', 4, 0xdc00U | ((number - 0x10000U) & 0x3ffU));
     } else {
-        outputHex('U', 8, value);
+        outputHex('U', 8, number);
     }
 }
 

diff --git a/packages/livestatus/src/StringFilter.cc b/packages/livestatus/src/StringFilter.cc
@@ -5,6 +5,7 @@
 
 #include "livestatus/StringFilter.h"
 
+#include <compare>
 #include <utility>
 
 #include "livestatus/RegExp.h"

diff --git a/packages/livestatus/src/TableHostGroups.cc b/packages/livestatus/src/TableHostGroups.cc
@@ -4,6 +4,7 @@
 // source code package.
 #include "livestatus/TableHostGroups.h"
 
+#include <algorithm>
 #include <memory>
 #include <vector>
 

diff --git a/packages/livestatus/src/TableHosts.cc b/packages/livestatus/src/TableHosts.cc
@@ -5,6 +5,7 @@
 
 #include "livestatus/TableHosts.h"
 
+#include <algorithm>
 #include <chrono>
 #include <cstdint>
 #include <filesystem>

diff --git a/packages/livestatus/src/TableServiceGroups.cc b/packages/livestatus/src/TableServiceGroups.cc
@@ -5,6 +5,7 @@
 
 #include "livestatus/TableServiceGroups.h"
 
+#include <algorithm>
 #include <memory>
 #include <vector>
 

diff --git a/packages/livestatus/src/TableServices.cc b/packages/livestatus/src/TableServices.cc
@@ -5,6 +5,7 @@
 
 #include "livestatus/TableServices.h"
 
+#include <algorithm>
 #include <chrono>
 #include <cstdint>
 #include <filesystem>

diff --git a/packages/livestatus/src/TableStateHistory.cc b/packages/livestatus/src/TableStateHistory.cc
@@ -5,6 +5,7 @@
 
 #include "livestatus/TableStateHistory.h"
 
+#include <compare>
 #include <cstddef>
 #include <optional>
 #include <ratio>

diff --git a/packages/livestatus/src/TrialManager.cc b/packages/livestatus/src/TrialManager.cc
@@ -7,6 +7,7 @@
 
 #include <endian.h>
 
+#include <compare>
 #include <cstdint>
 #include <istream>
 #include <ratio>

diff --git a/packages/livestatus/src/global_counters.cc b/packages/livestatus/src/global_counters.cc
@@ -6,6 +6,7 @@
 #include "livestatus/global_counters.h"
 
 #include <chrono>
+#include <compare>
 #include <mutex>
 #include <optional>
 #include <ratio>

diff --git a/packages/livestatus/test/test_LogEntry.cc b/packages/livestatus/test/test_LogEntry.cc
@@ -3,6 +3,7 @@
 // terms and conditions defined in the file COPYING, which is part of this
 // source code package.
 
+#include <algorithm>
 #include <chrono>
 #include <ctime>
 #include <stdexcept>

diff --git a/packages/livestatus/test/test_Metric.cc b/packages/livestatus/test/test_Metric.cc
@@ -4,6 +4,7 @@
 // source code package.
 
 #include <algorithm>
+#include <compare>
 #include <filesystem>
 #include <fstream>
 #include <iterator>

diff --git a/packages/neb/CMakeLists.txt b/packages/neb/CMakeLists.txt
@@ -1,10 +1,18 @@
 cmake_minimum_required(VERSION 3.24)
 
+set(root_repo_dir ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(CMK_VERSION 2.3.0)
 set(PLANTUTML_VERSION 1.2022.13)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_COMPILER g++-13) # TODO: replace with more intelligent approach
-set(root_repo_dir ${CMAKE_CURRENT_SOURCE_DIR}/../..)
+
+set(CMK_VERSION 2.3.0)
+string(REGEX REPLACE "([0-9]+)\.([0-9]+)\.([0-9]+).*" "\\1.\\2.\\3"
+                     MANGLED_VERSION ${CMK_VERSION})
+
 add_compile_options(
   -Wall
   -Wextra
@@ -14,17 +22,13 @@ add_compile_options(
   -DASIO_NO_DEPRECATED
   -fPIC
   -gdwarf-4
-  -std=c++17
   -O3)
 
-string(REGEX REPLACE "([0-9]+)\.([0-9]+)\.([0-9]+).*" "\\1.\\2.\\3"
-                     MANGLED_VERSION ${CMK_VERSION})
 project(
   neb
   VERSION ${MANGLED_VERSION}
   DESCRIPTION "Livestatus NEB"
   LANGUAGES CXX)
 
-# SUB-DIRS:
 add_subdirectory(src)
 add_subdirectory(test)
diff --git a/packages/neb/doc/Doxyfile b/packages/neb/doc/Doxyfile
@@ -1171,7 +1171,7 @@ CLANG_ADD_INC_PATHS    = YES
 # specified with INPUT and INCLUDE_PATH.
 # This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
 
-CLANG_OPTIONS          = -std=c++17 \
+CLANG_OPTIONS          = -std=c++20 \
                          -Iinclude \
                          -Ithird_party/include \
                          -Ibuild/_deps/asio-omd-src/include \

diff --git a/packages/neb/src/TimeperiodsCache.cc b/packages/neb/src/TimeperiodsCache.cc
@@ -5,6 +5,7 @@
 
 #include "neb/TimeperiodsCache.h"
 
+#include <compare>
 #include <ratio>
 #include <utility>
 

diff --git a/packages/neb/src/module.cc b/packages/neb/src/module.cc
@@ -17,6 +17,7 @@
 #include <atomic>
 #include <cerrno>
 #include <chrono>
+#include <compare>
 #include <cstddef>
 #include <cstdint>
 #include <cstdlib>

diff --git a/packages/neb/test/test_utilities.cc b/packages/neb/test/test_utilities.cc
@@ -5,6 +5,7 @@
 
 #include "test_utilities.h"
 
+#include <algorithm>
 #include <string>
 #include <unordered_map>
 #include <utility>

diff --git a/packages/unixcat/CMakeLists.txt b/packages/unixcat/CMakeLists.txt
@@ -1,17 +1,21 @@
 cmake_minimum_required(VERSION 3.24)
 
+set(root_repo_dir ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(PLANTUTML_VERSION 1.2022.13)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_COMPILER g++-13) # TODO: replace with more intelligent approach
-set(root_repo_dir ${CMAKE_CURRENT_SOURCE_DIR}/../..)
+
 add_compile_options(
   -Wall
   -Wextra
   -Werror
   -DHAVE_RE2
   -fPIC
   -gdwarf-4
-  -std=c++17
   -O3)
 
 project(
@@ -20,6 +24,5 @@ project(
   DESCRIPTION "unixcat"
   LANGUAGES CXX)
 
-# SUB-DIRS:
 add_subdirectory(src)
 add_subdirectory(test)