Move to C++20 and get rid of vector_utils_legacy

key4hep · Jul 21, 2024 · cc5716e · cc5716e
1 parent 72265af
commit cc5716e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 314 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,9 +38,9 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
 endif()
 
 # - Define the C++ Standard to use (Simplest Possible)
-set(CMAKE_CXX_STANDARD 17 CACHE STRING "")
+set(CMAKE_CXX_STANDARD 20 CACHE STRING "")
 
-if(NOT CMAKE_CXX_STANDARD MATCHES "17|20")
+if(NOT CMAKE_CXX_STANDARD MATCHES "20|23")
   message(FATAL_ERROR "Unsupported C++ standard: ${CMAKE_CXX_STANDARD}")
 endif()
 

diff --git a/utils/include/edm4hep/utils/vector_utils.h b/utils/include/edm4hep/utils/vector_utils.h
@@ -1,12 +1,6 @@
 #ifndef EDM4HEP_UTILS_VECTOR_HH
 #define EDM4HEP_UTILS_VECTOR_HH
 
-// These ultilies require concepts. If not available, use the fallback
-// vector_utils_legacy.h instead to capture most functionality.
-#if !__cpp_concepts
-#include <edm4hep/utils/vector_utils_legacy.h>
-#else
-
 #include <edm4hep/Vector3f.h>
 
 #include <cmath>
@@ -327,4 +321,3 @@ inline constexpr V operator/(const V& v, const double d) {
 } // namespace edm4hep
 
 #endif
-#endif
diff --git a/utils/include/edm4hep/utils/vector_utils_legacy.h b/utils/include/edm4hep/utils/vector_utils_legacy.h