Port to GCC 9

lefticus · lefticus · commit 91b12ab13b61 · 2022-02-04T18:09:22.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -72,6 +72,12 @@ dynamic_project_options(
   # GCC_WARNINGS   # Override the defaults for the GCC warnings
 )
 
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9")
+  target_link_libraries(project_options INTERFACE stdc++fs)
+endif()
+
+
 target_compile_features(project_options INTERFACE cxx_std_${USER_CXX_STANDARD})
 
 # Adding the src:
diff --git a/build_examples.sh b/build_examples.sh
diff --git a/include/json2cpp/constexpr_json.hpp b/include/json2cpp/constexpr_json.hpp
@@ -71,9 +71,7 @@ struct json
       }
     }
 
-    constexpr const json *operator->() const {
-      return &(*(*this));
-    }
+    constexpr const json *operator->() const { return &(*(*this)); }
 
     constexpr std::size_t index() const { return index_; }
 
@@ -177,13 +175,10 @@ struct json
     }
   }
 
-  constexpr iterator find(const std::string_view key) const 
+  constexpr iterator find(const std::string_view key) const
   {
-    for (auto itr = begin(); itr != end(); ++itr)
-    {
-      if (itr.key() == key) {
-        return itr;
-      }
+    for (auto itr = begin(); itr != end(); ++itr) {
+      if (itr.key() == key) { return itr; }
     }
 
     return end();
@@ -193,13 +188,26 @@ struct json
   {
     const auto &children = object_data();
 
-    // find_if is not constexpr yet in C++17
-    for (const auto &value : children) {
-      // cppcheck-suppress useStlAlgorithm
-      if (value.first == key) { return value.second; }
-    }
+    // find_if is not constexpr in C++17, so we rolled our own,
+    // and this helps us work around bugs in older versions of GCC
+    // and constexpr
+    const auto find = [&]() {
+      auto itr = children.begin();
+
+      for (; itr != children.end(); ++itr) {
+        if (itr->first == key) { return itr; }
+      }
+
+      return itr;
+    };
+
+    const auto obj = find();
 
-    throw std::runtime_error("Key not found");
+    if (obj != children.end()) {
+      return obj->second;
+    } else {
+      throw std::runtime_error("Key not found");
+    }
   }
 
   constexpr const array_t &array_data() const
