From b6f9ec2a333809f5c061ddfb730780da15327508 Mon Sep 17 00:00:00 2001 From: Michael Krasnyk Date: Thu, 12 Jan 2017 22:54:30 +0100 Subject: [PATCH] make facades const to be consistent with const shmem block --- include/engine/engine.hpp | 2 +- include/engine/plugins/match.hpp | 2 +- include/engine/plugins/nearest.hpp | 2 +- include/engine/plugins/table.hpp | 2 +- include/engine/plugins/tile.hpp | 2 +- include/engine/plugins/trip.hpp | 2 +- include/engine/plugins/viaroute.hpp | 2 +- src/engine/engine.cpp | 4 ++-- src/engine/plugins/match.cpp | 2 +- src/engine/plugins/nearest.cpp | 2 +- src/engine/plugins/table.cpp | 2 +- src/engine/plugins/tile.cpp | 2 +- src/engine/plugins/trip.cpp | 2 +- src/engine/plugins/viaroute.cpp | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/engine/engine.hpp b/include/engine/engine.hpp index b8cea3562..e021e39c1 100644 --- a/include/engine/engine.hpp +++ b/include/engine/engine.hpp @@ -59,7 +59,7 @@ class Engine final // note in case of shared memory this will be empty, since the watchdog // will provide us with the up-to-date facade - std::shared_ptr immutable_data_facade; + std::shared_ptr immutable_data_facade; }; } } diff --git a/include/engine/plugins/match.hpp b/include/engine/plugins/match.hpp index 4e539d316..44cd65486 100644 --- a/include/engine/plugins/match.hpp +++ b/include/engine/plugins/match.hpp @@ -33,7 +33,7 @@ class MatchPlugin : public BasePlugin { } - Status HandleRequest(const std::shared_ptr facade, + Status HandleRequest(const std::shared_ptr facade, const api::MatchParameters ¶meters, util::json::Object &json_result) const; diff --git a/include/engine/plugins/nearest.hpp b/include/engine/plugins/nearest.hpp index 22290344e..6c773ec67 100644 --- a/include/engine/plugins/nearest.hpp +++ b/include/engine/plugins/nearest.hpp @@ -17,7 +17,7 @@ class NearestPlugin final : public BasePlugin public: explicit NearestPlugin(const int max_results); - Status HandleRequest(const std::shared_ptr facade, + Status HandleRequest(const std::shared_ptr facade, const api::NearestParameters ¶ms, util::json::Object &result) const; diff --git a/include/engine/plugins/table.hpp b/include/engine/plugins/table.hpp index 44cf1bb97..78c9e4eef 100644 --- a/include/engine/plugins/table.hpp +++ b/include/engine/plugins/table.hpp @@ -20,7 +20,7 @@ class TablePlugin final : public BasePlugin public: explicit TablePlugin(const int max_locations_distance_table); - Status HandleRequest(const std::shared_ptr facade, + Status HandleRequest(const std::shared_ptr facade, const api::TableParameters ¶ms, util::json::Object &result) const; diff --git a/include/engine/plugins/tile.hpp b/include/engine/plugins/tile.hpp index 1a84452fb..35c64bf92 100644 --- a/include/engine/plugins/tile.hpp +++ b/include/engine/plugins/tile.hpp @@ -26,7 +26,7 @@ namespace plugins class TilePlugin final : public BasePlugin { public: - Status HandleRequest(const std::shared_ptr facade, + Status HandleRequest(const std::shared_ptr facade, const api::TileParameters ¶meters, std::string &pbf_buffer) const; }; diff --git a/include/engine/plugins/trip.hpp b/include/engine/plugins/trip.hpp index b3f604abd..676492490 100644 --- a/include/engine/plugins/trip.hpp +++ b/include/engine/plugins/trip.hpp @@ -44,7 +44,7 @@ class TripPlugin final : public BasePlugin { } - Status HandleRequest(const std::shared_ptr facade, + Status HandleRequest(const std::shared_ptr facade, const api::TripParameters ¶meters, util::json::Object &json_result) const; }; diff --git a/include/engine/plugins/viaroute.hpp b/include/engine/plugins/viaroute.hpp index 9842d4469..c90fd9ce0 100644 --- a/include/engine/plugins/viaroute.hpp +++ b/include/engine/plugins/viaroute.hpp @@ -38,7 +38,7 @@ class ViaRoutePlugin final : public BasePlugin public: explicit ViaRoutePlugin(int max_locations_viaroute); - Status HandleRequest(const std::shared_ptr facade, + Status HandleRequest(const std::shared_ptr facade, const api::RouteParameters &route_parameters, util::json::Object &json_result) const; }; diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index 7c5163fe8..61a4d6df1 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp @@ -27,7 +27,7 @@ namespace template osrm::engine::Status RunQuery(const std::unique_ptr &watchdog, - const std::shared_ptr &immutable_facade, + const std::shared_ptr &immutable_facade, const ParameterT ¶meters, PluginT &plugin, ResultT &result) @@ -81,7 +81,7 @@ Engine::Engine(const EngineConfig &config) throw util::exception("Invalid file paths given!" + SOURCE_REF); } immutable_data_facade = - std::make_shared(config.storage_config); + std::make_shared(config.storage_config); } } diff --git a/src/engine/plugins/match.cpp b/src/engine/plugins/match.cpp index 4fa6a97fe..839bb80ef 100644 --- a/src/engine/plugins/match.cpp +++ b/src/engine/plugins/match.cpp @@ -108,7 +108,7 @@ void filterCandidates(const std::vector &coordinates, } } -Status MatchPlugin::HandleRequest(const std::shared_ptr facade, +Status MatchPlugin::HandleRequest(const std::shared_ptr facade, const api::MatchParameters ¶meters, util::json::Object &json_result) const { diff --git a/src/engine/plugins/nearest.cpp b/src/engine/plugins/nearest.cpp index 5ccd3e864..13af756b0 100644 --- a/src/engine/plugins/nearest.cpp +++ b/src/engine/plugins/nearest.cpp @@ -19,7 +19,7 @@ namespace plugins NearestPlugin::NearestPlugin(const int max_results_) : max_results{max_results_} {} -Status NearestPlugin::HandleRequest(const std::shared_ptr facade, +Status NearestPlugin::HandleRequest(const std::shared_ptr facade, const api::NearestParameters ¶ms, util::json::Object &json_result) const { diff --git a/src/engine/plugins/table.cpp b/src/engine/plugins/table.cpp index 7eca52e87..9e8524782 100644 --- a/src/engine/plugins/table.cpp +++ b/src/engine/plugins/table.cpp @@ -28,7 +28,7 @@ TablePlugin::TablePlugin(const int max_locations_distance_table) { } -Status TablePlugin::HandleRequest(const std::shared_ptr facade, +Status TablePlugin::HandleRequest(const std::shared_ptr facade, const api::TableParameters ¶ms, util::json::Object &result) const { diff --git a/src/engine/plugins/tile.cpp b/src/engine/plugins/tile.cpp index 4970108fb..e77ba1e06 100644 --- a/src/engine/plugins/tile.cpp +++ b/src/engine/plugins/tile.cpp @@ -248,7 +248,7 @@ FixedPoint coordinatesToTilePoint(const util::Coordinate point, const BBox &tile } // namespace -Status TilePlugin::HandleRequest(const std::shared_ptr facade, +Status TilePlugin::HandleRequest(const std::shared_ptr facade, const api::TileParameters ¶meters, std::string &pbf_buffer) const { diff --git a/src/engine/plugins/trip.cpp b/src/engine/plugins/trip.cpp index 036d073e9..675db6230 100644 --- a/src/engine/plugins/trip.cpp +++ b/src/engine/plugins/trip.cpp @@ -141,7 +141,7 @@ InternalRouteResult TripPlugin::ComputeRoute(const datafacade::BaseDataFacade &f return min_route; } -Status TripPlugin::HandleRequest(const std::shared_ptr facade, +Status TripPlugin::HandleRequest(const std::shared_ptr facade, const api::TripParameters ¶meters, util::json::Object &json_result) const { diff --git a/src/engine/plugins/viaroute.cpp b/src/engine/plugins/viaroute.cpp index b3d3fc97b..0c4227c6e 100644 --- a/src/engine/plugins/viaroute.cpp +++ b/src/engine/plugins/viaroute.cpp @@ -27,7 +27,7 @@ ViaRoutePlugin::ViaRoutePlugin(int max_locations_viaroute) { } -Status ViaRoutePlugin::HandleRequest(const std::shared_ptr facade, +Status ViaRoutePlugin::HandleRequest(const std::shared_ptr facade, const api::RouteParameters &route_parameters, util::json::Object &json_result) const {