Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

remove ServerPaths member from OSRM_impl. pass it by value to c'tor

Browse Source
This commit is contained in:
Dennis Luxen 2014-10-08 17:25:38 +02:00
parent b9e1d3116c
commit c3b54a63c3
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/OSRM.h
View File

@ -46,7 +46,7 @@ class OSRM
std::unique_ptr<OSRM_impl> OSRM_pimpl_; std::unique_ptr<OSRM_impl> OSRM_pimpl_;
public: public:
explicit OSRM(const ServerPaths &paths, const bool use_shared_memory = false); explicit OSRM(ServerPaths paths, const bool use_shared_memory = false);
~OSRM(); ~OSRM();
void RunQuery(RouteParameters &route_parameters, http::Reply &reply); void RunQuery(RouteParameters &route_parameters, http::Reply &reply);
}; };

5
Library/OSRM_impl.cpp
View File

@ -58,8 +58,7 @@ namespace boost { namespace interprocess { class named_mutex; } }
#include <utility> #include <utility>
#include <vector> #include <vector>
OSRM_impl::OSRM_impl(const ServerPaths &paths, const bool use_shared_memory) OSRM_impl::OSRM_impl(ServerPaths server_paths, const bool use_shared_memory)
: server_paths(paths)
{ {
if (use_shared_memory) if (use_shared_memory)
{ {
@ -158,7 +157,7 @@ void OSRM_impl::RunQuery(RouteParameters &route_parameters, http::Reply &reply)
// proxy code for compilation firewall // proxy code for compilation firewall
OSRM::OSRM(const ServerPaths &paths, const bool use_shared_memory) OSRM::OSRM(ServerPaths paths, const bool use_shared_memory)
: OSRM_pimpl_(osrm::make_unique<OSRM_impl>(paths, use_shared_memory)) : OSRM_pimpl_(osrm::make_unique<OSRM_impl>(paths, use_shared_memory))
{ {
} }

3
Library/OSRM_impl.h
View File

@ -48,7 +48,7 @@ class OSRM_impl
using PluginMap = std::unordered_map<std::string, BasePlugin *>; using PluginMap = std::unordered_map<std::string, BasePlugin *>;
public: public:
OSRM_impl(const ServerPaths &paths, const bool use_shared_memory); OSRM_impl(ServerPaths paths, const bool use_shared_memory);
OSRM_impl(const OSRM_impl &) = delete; OSRM_impl(const OSRM_impl &) = delete;
virtual ~OSRM_impl(); virtual ~OSRM_impl();
void RunQuery(RouteParameters &route_parameters, http::Reply &reply); void RunQuery(RouteParameters &route_parameters, http::Reply &reply);
@ -56,7 +56,6 @@ class OSRM_impl
private: private:
void RegisterPlugin(BasePlugin *plugin); void RegisterPlugin(BasePlugin *plugin);
PluginMap plugin_map; PluginMap plugin_map;
ServerPaths server_paths;
bool use_shared_memory; bool use_shared_memory;
SharedBarriers *barrier; SharedBarriers *barrier;
// base class pointer to the objects // base class pointer to the objects