diff --git a/CMakeLists.txt b/CMakeLists.txt index ecbb64545a928c3d5aab5784bd9a53030e4a5ebc..fc75bb5f5db53ca167ec6e54adaa8cbe952b1de1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,8 @@ elseif(NOT "" STREQUAL "$ENV{Simox_BOOST_VERSION}") SET(Simox_BOOST_VERSION $ENV{Simox_BOOST_VERSION}) elseif(RELEASE_CODENAME STREQUAL focal OR RELEASE_CODENAME STREQUAL odin) SET(Simox_BOOST_VERSION 1.71.0) +elseif(RELEASE_CODENAME STREQUAL impish) + SET(Simox_BOOST_VERSION 1.74.0) else() SET(Simox_BOOST_VERSION 1.65.1) endif() diff --git a/SimoxUtility/algorithm/string/string_tools.h b/SimoxUtility/algorithm/string/string_tools.h index 1a7e8b3ed3614b4d3edb8276e020886f7bfac95e..73e2ba7fed71712dbb3c48f92435a8d69adcf3bb 100644 --- a/SimoxUtility/algorithm/string/string_tools.h +++ b/SimoxUtility/algorithm/string/string_tools.h @@ -21,7 +21,7 @@ #pragma once -#include <string> +#include <cstring> #include <sstream> #include <vector> #include <locale> diff --git a/SimoxUtility/color/ColorMap.h b/SimoxUtility/color/ColorMap.h index d0ec4c553074fb8a3df8690aacd21c8c3caaaa93..951b83cae369e5f5f7ede20b8596e91af8cb39d8 100644 --- a/SimoxUtility/color/ColorMap.h +++ b/SimoxUtility/color/ColorMap.h @@ -5,6 +5,7 @@ #include <initializer_list> #include <map> #include <string> +#include <optional> #include <SimoxUtility/algorithm/apply.hpp> #include <SimoxUtility/algorithm/minmax.h> diff --git a/SimoxUtility/json/json.hpp b/SimoxUtility/json/json.hpp index 931e7b3662061d92aacc45f018307bae979af73c..969fd49aef25261c6d753c24b3af1735c7bbb792 100644 --- a/SimoxUtility/json/json.hpp +++ b/SimoxUtility/json/json.hpp @@ -9627,7 +9627,7 @@ class binary_writer static CharType to_char_type(std::uint8_t x) noexcept { static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t"); - static_assert(std::is_pod<CharType>::value, "CharType must be POD"); + static_assert(std::is_standard_layout_v<CharType> && std::is_trivial_v<CharType>, "CharType must be POD"); CharType result; std::memcpy(&result, &x, sizeof(x)); return result;