Merge branch 'master' into feature-#189

lcsdavid · web-flow · commit 36ea60b417a5 · 2021-08-09T12:20:02.000+02:00
diff --git a/include/crow/routing.h b/include/crow/routing.h
@@ -22,7 +22,7 @@ namespace crow
 #ifdef CROW_MAIN
     uint16_t INVALID_BP_ID{0xFFFF};
 #else
-    extern uint16_t INVALID_BP_ID{0xFFFF};
+    extern uint16_t INVALID_BP_ID;
 #endif
     /// A base class for all rules.
 
@@ -1332,7 +1332,7 @@ namespace crow
                 }
             }
             else if (!blueprint->static_dir_.empty())
-                methods.emplace_back(HTTPMethod::GET);
+                methods.emplace_back(HTTPMethod::Get);
             for (auto& rule: blueprint->all_rules_)
             {
                 rule->foreach_method([&methods](unsigned method){

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ namespace crow`
`22`	`22`	`#ifdef CROW_MAIN`
`23`	`23`	`uint16_t INVALID_BP_ID{0xFFFF};`
`24`	`24`	`#else`
`25`		`- extern uint16_t INVALID_BP_ID{0xFFFF};`
	`25`	`+ extern uint16_t INVALID_BP_ID;`
`26`	`26`	`#endif`
`27`	`27`	`/// A base class for all rules.`
`28`	`28`
`@@ -1332,7 +1332,7 @@ namespace crow`
`1332`	`1332`	`}`
`1333`	`1333`	`}`
`1334`	`1334`	`else if (!blueprint->static_dir_.empty())`
`1335`		`- methods.emplace_back(HTTPMethod::GET);`
	`1335`	`+ methods.emplace_back(HTTPMethod::Get);`
`1336`	`1336`	`for (auto& rule: blueprint->all_rules_)`
`1337`	`1337`	`{`
`1338`	`1338`	`rule->foreach_method([&methods](unsigned method){`