Update submodule

h3x4n1um · Nov 13, 2020 · fee5e8c · fee5e8c
1 parent 2ebe90e
commit fee5e8c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -3,5 +3,4 @@
 	url = https://github.com/nlohmann/json
 [submodule "rton-json/third_party/fifo_map"]
 	path = rton-json/third_party/fifo_map
-	url = https://github.com/h3x4n1um/fifo_map
-	branch = cmake-submodule
+	url = https://github.com/nlohmann/fifo_map
diff --git a/rton-json/include/json_fifo.hpp b/rton-json/include/json_fifo.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <nlohmann/json.hpp>
 #include <fifo_map.hpp>
+#include <nlohmann/json.hpp>
 
 namespace json_fifo{
     //a workaround to give to use fifo_map as map, we are just ignoring the 'less' compare

diff --git a/rton-json/third_party/fifo_map b/rton-json/third_party/fifo_map
diff --git a/rton-json/third_party/json b/rton-json/third_party/json