remove ServerPaths member from OSRM_impl. pass it by value to c'tor
This commit is contained in:
		
							parent
							
								
									b9e1d3116c
								
							
						
					
					
						commit
						c3b54a63c3
					
				| @ -46,7 +46,7 @@ class OSRM | ||||
|     std::unique_ptr<OSRM_impl> OSRM_pimpl_; | ||||
| 
 | ||||
|   public: | ||||
|     explicit OSRM(const ServerPaths &paths, const bool use_shared_memory = false); | ||||
|     explicit OSRM(ServerPaths paths, const bool use_shared_memory = false); | ||||
|     ~OSRM(); | ||||
|     void RunQuery(RouteParameters &route_parameters, http::Reply &reply); | ||||
| }; | ||||
|  | ||||
| @ -58,8 +58,7 @@ namespace boost { namespace interprocess { class named_mutex; } } | ||||
| #include <utility> | ||||
| #include <vector> | ||||
| 
 | ||||
| OSRM_impl::OSRM_impl(const ServerPaths &paths, const bool use_shared_memory) | ||||
|     : server_paths(paths) | ||||
| OSRM_impl::OSRM_impl(ServerPaths server_paths, const bool 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
 | ||||
| 
 | ||||
| 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)) | ||||
| { | ||||
| } | ||||
|  | ||||
| @ -48,7 +48,7 @@ class OSRM_impl | ||||
|     using PluginMap = std::unordered_map<std::string, BasePlugin *>; | ||||
| 
 | ||||
|   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; | ||||
|     virtual ~OSRM_impl(); | ||||
|     void RunQuery(RouteParameters &route_parameters, http::Reply &reply); | ||||
| @ -56,7 +56,6 @@ class OSRM_impl | ||||
|   private: | ||||
|     void RegisterPlugin(BasePlugin *plugin); | ||||
|     PluginMap plugin_map; | ||||
|     ServerPaths server_paths; | ||||
|     bool use_shared_memory; | ||||
|     SharedBarriers *barrier; | ||||
|     // base class pointer to the objects
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user