From 4b8c0ac1431b2744cd5a966343e7a12898c77d42 Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Fri, 12 Feb 2016 15:23:33 -0800 Subject: [PATCH] Revert "Folds json_* utilities into json subfolder and adapts includes" This reverts commit cd039c69c0a92a35889e3c875b8eb53cf07377bb. --- CMakeLists.txt | 2 +- include/engine/plugins/match.hpp | 4 ++-- include/engine/plugins/viaroute.hpp | 4 ++-- .../routing_algorithms/map_matching.hpp | 2 +- include/osrm/json_container.hpp | 5 +--- .../container.hpp => json_container.hpp} | 14 +++++------ .../util/{json/logger.hpp => json_logger.hpp} | 0 .../{json/renderer.hpp => json_renderer.hpp} | 23 ++++++++++++------- include/util/{json/util.hpp => json_util.hpp} | 0 include/util/matching_debug_info.hpp | 4 ++-- src/server/request_handler.cpp | 5 ++-- unit_tests/util/static_rtree.cpp | 1 + 12 files changed, 35 insertions(+), 29 deletions(-) rename include/util/{json/container.hpp => json_container.hpp} (90%) rename include/util/{json/logger.hpp => json_logger.hpp} (100%) rename include/util/{json/renderer.hpp => json_renderer.hpp} (88%) rename include/util/{json/util.hpp => json_util.hpp} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c293dbff2..efc6d36bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -379,7 +379,7 @@ set_property(TARGET osrm-routed PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE) file(GLOB VariantGlob third_party/variant/*.hpp) file(GLOB LibraryGlob include/osrm/*.hpp) set(EngineHeader include/engine/engine.hpp include/engine/engine_config.hpp include/engine/route_parameters.hpp) -set(UtilHeader include/util/coordinate.hpp include/util/json/container.hpp) +set(UtilHeader include/util/coordinate.hpp include/util/json_container.hpp) set(ExtractorHeader include/extractor/extractor.hpp include/extractor/extractor_config.hpp) set(ContractorHeader include/contractor/contractor.hpp include/contractor/contractor_config.hpp) #set(StorageHeader include/storage/storage.hpp include/storage/storage_config.hpp) diff --git a/include/engine/plugins/match.hpp b/include/engine/plugins/match.hpp index 1b6a13f01..0de44148a 100644 --- a/include/engine/plugins/match.hpp +++ b/include/engine/plugins/match.hpp @@ -12,8 +12,8 @@ #include "engine/routing_algorithms/map_matching.hpp" #include "util/coordinate_calculation.hpp" #include "util/integer_range.hpp" -#include "util/json/logger.hpp" -#include "util/json/util.hpp" +#include "util/json_logger.hpp" +#include "util/json_util.hpp" #include "util/string_util.hpp" #include diff --git a/include/engine/plugins/viaroute.hpp b/include/engine/plugins/viaroute.hpp index fe041dd5c..6789e5ac0 100644 --- a/include/engine/plugins/viaroute.hpp +++ b/include/engine/plugins/viaroute.hpp @@ -8,11 +8,11 @@ #include "engine/search_engine.hpp" #include "util/for_each_pair.hpp" #include "util/integer_range.hpp" -#include "osrm/json_container.hpp" -#include "util/json/renderer.hpp" +#include "util/json_renderer.hpp" #include "util/make_unique.hpp" #include "util/simple_logger.hpp" #include "util/timing_util.hpp" +#include "osrm/json_container.hpp" #include diff --git a/include/engine/routing_algorithms/map_matching.hpp b/include/engine/routing_algorithms/map_matching.hpp index 61ba88121..f3422dd6d 100644 --- a/include/engine/routing_algorithms/map_matching.hpp +++ b/include/engine/routing_algorithms/map_matching.hpp @@ -5,7 +5,7 @@ #include "util/coordinate_calculation.hpp" #include "engine/map_matching/hidden_markov_model.hpp" -#include "util/json/logger.hpp" +#include "util/json_logger.hpp" #include "util/matching_debug_info.hpp" #include diff --git a/include/osrm/json_container.hpp b/include/osrm/json_container.hpp index bcf02e1b4..1b0787713 100644 --- a/include/osrm/json_container.hpp +++ b/include/osrm/json_container.hpp @@ -1,11 +1,8 @@ #ifndef GLOBAL_JSON_CONTAINER_HPP #define GLOBAL_JSON_CONTAINER_HPP - -#include "util/json/container.hpp" - +#include "util/json_container.hpp" namespace osrm { namespace json = osrm::util::json; } - #endif diff --git a/include/util/json/container.hpp b/include/util/json_container.hpp similarity index 90% rename from include/util/json/container.hpp rename to include/util/json_container.hpp index d44b628b3..d3a9ca4a8 100644 --- a/include/util/json/container.hpp +++ b/include/util/json_container.hpp @@ -33,9 +33,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include +#include #include #include -#include #include namespace osrm @@ -52,16 +52,16 @@ struct Array; struct String { - String() = default; - String(const char *value_) : value{value_} {} - String(std::string value_) : value{std::move(value_)} {} + String() {} + String(const char *value) : value(value) {} + String(std::string value) : value(std::move(value)) {} std::string value; }; struct Number { - Number() = default; - Number(double value_) : value{value_} {} + Number() {} + Number(double value) : value(static_cast(value)) {} double value; }; @@ -95,7 +95,7 @@ struct Array std::vector values; }; -} // namespace json +} // namespace JSON } // namespace util } // namespace osrm diff --git a/include/util/json/logger.hpp b/include/util/json_logger.hpp similarity index 100% rename from include/util/json/logger.hpp rename to include/util/json_logger.hpp diff --git a/include/util/json/renderer.hpp b/include/util/json_renderer.hpp similarity index 88% rename from include/util/json/renderer.hpp rename to include/util/json_renderer.hpp index 10d1876bc..9569829f0 100644 --- a/include/util/json/renderer.hpp +++ b/include/util/json_renderer.hpp @@ -9,11 +9,6 @@ #include "osrm/json_container.hpp" -#include -#include -#include -#include - namespace osrm { namespace util @@ -128,11 +123,23 @@ struct ArrayRenderer out.push_back(']'); } - void operator()(const True &) const { out.insert(end(out), {'t', 'r', 'u', 'e'}); } + void operator()(const True &) const + { + const std::string temp("true"); + out.insert(out.end(), temp.begin(), temp.end()); + } - void operator()(const False &) const { out.insert(end(out), {'f', 'a', 'l', 's', 'e'}); } + void operator()(const False &) const + { + const std::string temp("false"); + out.insert(out.end(), temp.begin(), temp.end()); + } - void operator()(const Null &) const { out.insert(end(out), {'n', 'u', 'l', 'l'}); } + void operator()(const Null &) const + { + const std::string temp("null"); + out.insert(out.end(), temp.begin(), temp.end()); + } private: std::vector &out; diff --git a/include/util/json/util.hpp b/include/util/json_util.hpp similarity index 100% rename from include/util/json/util.hpp rename to include/util/json_util.hpp diff --git a/include/util/matching_debug_info.hpp b/include/util/matching_debug_info.hpp index bb5253456..e90053378 100644 --- a/include/util/matching_debug_info.hpp +++ b/include/util/matching_debug_info.hpp @@ -1,8 +1,8 @@ #ifndef MATCHING_DEBUG_INFO_HPP #define MATCHING_DEBUG_INFO_HPP -#include "util/json/logger.hpp" -#include "util/json/util.hpp" +#include "util/json_logger.hpp" +#include "util/json_util.hpp" #include "engine/map_matching/hidden_markov_model.hpp" #include "osrm/coordinate.hpp" diff --git a/src/server/request_handler.cpp b/src/server/request_handler.cpp index c87def7d8..6df6c1e99 100644 --- a/src/server/request_handler.cpp +++ b/src/server/request_handler.cpp @@ -4,13 +4,14 @@ #include "server/http/reply.hpp" #include "server/http/request.hpp" -#include "util/json/container.hpp" -#include "util/json/renderer.hpp" +#include "util/json_renderer.hpp" #include "util/simple_logger.hpp" #include "util/string_util.hpp" #include "util/xml_renderer.hpp" #include "util/typedefs.hpp" + #include "engine/route_parameters.hpp" +#include "util/json_container.hpp" #include "osrm/osrm.hpp" #include diff --git a/unit_tests/util/static_rtree.cpp b/unit_tests/util/static_rtree.cpp index 3530fe048..fd3a19b69 100644 --- a/unit_tests/util/static_rtree.cpp +++ b/unit_tests/util/static_rtree.cpp @@ -3,6 +3,7 @@ #include "util/static_rtree.hpp" #include "extractor/query_node.hpp" #include "extractor/edge_based_node.hpp" +#include "util/floating_point.hpp" #include "util/typedefs.hpp" #include