Merge pull request #377 from CrowCpp/hotfix_compiler

Fixed problem where GCC < 6 wouldn't compile Crow
CrowCpp · Mar 30, 2022 · 1e73642 · 1e73642
2 parents f52ba61 + 5f18548
commit 1e73642
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/include/crow/json.h b/include/crow/json.h
@@ -16,13 +16,16 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/operators.hpp>
 #include <vector>
-#include <math.h>
+#include <cmath>
 
 #include "crow/utility.h"
 #include "crow/settings.h"
 #include "crow/returnable.h"
 #include "crow/logging.h"
 
+using std::isinf;
+using std::isnan;
+
 
 namespace crow
 {

diff --git a/include/crow/routing.h b/include/crow/routing.h
@@ -775,7 +775,7 @@ namespace crow
             if (pos == req_url.size())
             {
                 found_BP = std::move(*blueprints);
-                return {node->rule_index, *blueprints, *params};
+                return std::tuple<uint16_t, std::vector<uint16_t>, routing_params>{node->rule_index, *blueprints, *params};
             }
 
             bool found_fragment = false;
@@ -902,7 +902,7 @@ namespace crow
             if (!found_fragment)
                 found_BP = std::move(*blueprints);
 
-            return {found, found_BP, match_params}; //Called after all the recursions have been done
+            return std::tuple<uint16_t, std::vector<uint16_t>, routing_params>{found, found_BP, match_params}; //Called after all the recursions have been done
         }
 
         //This functions assumes any blueprint info passed is valid