use C++20

Author: scivision

cmake/abi_check/CMakeLists.txt

@@ -19,6 +19,7 @@ set_property(TARGET addone_f PROPERTY Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_B
 target_include_directories(addone_f PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 
 add_executable(main_cpp main.cpp $<TARGET_OBJECTS:addone_f>)
+target_compile_features(main_cpp PUBLIC cxx_std_17)
 add_test(NAME Cpp_main COMMAND main_cpp)
 
 add_executable(main_c main.c $<TARGET_OBJECTS:addone_f>)

cmake/abi_check/addtwo.cpp

@@ -1,5 +1,3 @@
 #include "myadd.h"
 
-int addtwo(int N){
-  return N + 2;
-}
+int addtwo(int N){ return N + 2; }

cmake/abi_check/main.cpp

@@ -5,9 +5,7 @@
 
 int main() {
 
-  int i = addone(2);
-
-  if(i != 3) {
+  if(int i = addone(2); i != 3) {
     std::cerr << "2 + 1 != " << i << "\n";
     return EXIT_FAILURE;
   }

test/iso_fortran_binding/sampling.cpp

@@ -7,27 +7,32 @@
 #include <span>
 #include <ranges>
 #include <algorithm>
+#include <vector>
+#include <string>
+#include <source_location>
 
 #include <ISO_Fortran_binding.h>
 
-static const char *cfi_errstrs[12] = {
-    "No error detected.\n",
-    "The base address member of a C descriptor is a null pointer in a context that requires a non-null pointer value.\n",
-    "The base address member of a C descriptor is not a null pointer in a context that requires a null pointer value.\n",
-    "The value supplied for the element length member of a C descriptor is not valid.\n",
-    "The value supplied for the rank member of a C descriptor is not valid.\n",
-    "The value supplied for the type member of a C descriptor is not valid.\n",
-    "The value supplied for the attribute member of a C descriptor is not valid.\n",
-    "The value supplied for the extent member of a CFI_dim_t structure is not valid.\n",
-    "A C descriptor is invalid in some way.\n",
-    "Memory allocation failed.\n",
-    "A reference is out of bounds.\n",
-    "Unrecognized status code.\n"
+
+
+static const std::vector<std::string> cfi_errstrs = {
+    "No error detected.",
+    "The base address member of a C descriptor is a null pointer in a context that requires a non-null pointer value.",
+    "The base address member of a C descriptor is not a null pointer in a context that requires a null pointer value.",
+    "The value supplied for the element length member of a C descriptor is not valid.",
+    "The value supplied for the rank member of a C descriptor is not valid.",
+    "The value supplied for the type member of a C descriptor is not valid.",
+    "The value supplied for the attribute member of a C descriptor is not valid.",
+    "The value supplied for the extent member of a CFI_dim_t structure is not valid.",
+    "A C descriptor is invalid in some way.",
+    "Memory allocation failed.",
+    "A reference is out of bounds.",
+    "Unrecognized status code."
 };
 
 // Returns the description string for an error code.
 //
-const char* cfiGetErrorString(int stat) {
+std::string cfiGetErrorString(int stat) {
 
     switch (stat) {
         case CFI_SUCCESS:                  return cfi_errstrs[0];
@@ -48,8 +53,10 @@ const char* cfiGetErrorString(int stat) {
 
 void check_cfi(int s)
 {
-  if (s != CFI_SUCCESS)
-    std::cerr << __FILE__ << ":" << __LINE__ << " CFI API failed with error: (" << s << ") " << cfiGetErrorString(s) << "\n";
+  if (s != CFI_SUCCESS){
+    constexpr std::source_location loc = std::source_location::current();
+    std::cerr << loc.file_name() << ":" << loc.line() << " CFI API failed with error: (" << s << ") " << cfiGetErrorString(s) << "\n";
+  }
 }
 
 template<typename Action>
@@ -71,7 +78,7 @@ class final_action
 template< class Fn >
 [[nodiscard]] auto finally( Fn const & f )
 {
-    return final_action(( f ));
+    return final_action( f );
 }
 
 //