Fix strict weak ordering requirements

uNetworking · Dec 4, 2024 · 468f5c8 · 468f5c8
1 parent 9c45399
commit 468f5c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/HttpRouter.h b/src/HttpRouter.h
@@ -302,14 +302,13 @@ struct HttpRouter {
 
         /* ANY method must be last, GET must be first */
         std::sort(root.children.begin(), root.children.end(), [](const auto &a, const auto &b) {
-            /* Assuming the list of methods is unique, non-repeating */
-            if (a->name == "GET") {
+            if (a->name == "GET" && b->name != "GET") {
                 return true;
-            } else if (b->name == "GET") {
+            } else if (b->name == "GET" && a->name != "GET") {
                 return false;
-            } else if (a->name == ANY_METHOD_TOKEN) {
+            } else if (a->name == ANY_METHOD_TOKEN && b->name != ANY_METHOD_TOKEN) {
                 return false;
-            } else if (b->name == ANY_METHOD_TOKEN) {
+            } else if (b->name == ANY_METHOD_TOKEN && a->name != ANY_METHOD_TOKEN) {
                 return true;
             } else {
                 return a->name < b->name;

diff --git a/tests/Makefile b/tests/Makefile
@@ -5,7 +5,7 @@ default:
 	./ChunkedEncoding
 	$(CXX) -std=c++17 -fsanitize=address TopicTree.cpp -o TopicTree
 	./TopicTree
-	$(CXX) -std=c++17 -fsanitize=address HttpRouter.cpp -o HttpRouter
+	$(CXX) -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG -std=c++17 -fsanitize=address HttpRouter.cpp -o HttpRouter
 	./HttpRouter
 	$(CXX) -std=c++17 -fsanitize=address BloomFilter.cpp -o BloomFilter
 	./BloomFilter