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

Remove unnecessary includes and rename in Engine

Browse Source
This commit is contained in:
Patrick Niklaus 2017-01-05 19:14:46 +00:00 committed by Patrick Niklaus
parent 710ba20acc
commit a7bb26f2d6
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/engine/engine.hpp
View File

@ -1,7 +1,6 @@
#ifndef ENGINE_HPP #ifndef ENGINE_HPP
#define ENGINE_HPP #define ENGINE_HPP
#include "storage/shared_barriers.hpp"
#include "engine/api/match_parameters.hpp" #include "engine/api/match_parameters.hpp"
#include "engine/api/nearest_parameters.hpp" #include "engine/api/nearest_parameters.hpp"
#include "engine/api/route_parameters.hpp" #include "engine/api/route_parameters.hpp"
@ -23,7 +22,6 @@
#include "util/json_container.hpp" #include "util/json_container.hpp"
#include <memory> #include <memory>
#include <mutex>
#include <string> #include <string>
namespace osrm namespace osrm
@ -50,7 +48,6 @@ class Engine final
Status Tile(const api::TileParameters &parameters, std::string &result) const; Status Tile(const api::TileParameters &parameters, std::string &result) const;
private: private:
//std::unique_ptr<storage::SharedBarriers> lock;
std::unique_ptr<DataWatchdog> watchdog; std::unique_ptr<DataWatchdog> watchdog;
const plugins::ViaRoutePlugin route_plugin; const plugins::ViaRoutePlugin route_plugin;

8
src/engine/engine.cpp
View File

@ -27,22 +27,22 @@ namespace
template <typename ParameterT, typename PluginT, typename ResultT> template <typename ParameterT, typename PluginT, typename ResultT>
osrm::engine::Status osrm::engine::Status
RunQuery(const std::unique_ptr<osrm::engine::DataWatchdog> &watchdog, RunQuery(const std::unique_ptr<osrm::engine::DataWatchdog> &watchdog,
const std::shared_ptr<osrm::engine::datafacade::BaseDataFacade> &facade, const std::shared_ptr<osrm::engine::datafacade::BaseDataFacade> &immutable_facade,
const ParameterT &parameters, const ParameterT &parameters,
PluginT &plugin, PluginT &plugin,
ResultT &result) ResultT &result)
{ {
if (watchdog) if (watchdog)
{ {
BOOST_ASSERT(!facade); BOOST_ASSERT(!immutable_facade);
auto facade = watchdog->GetDataFacade(); auto facade = watchdog->GetDataFacade();
return plugin.HandleRequest(facade, parameters, result); return plugin.HandleRequest(facade, parameters, result);
} }
BOOST_ASSERT(facade); BOOST_ASSERT(immutable_facade);
return plugin.HandleRequest(facade, parameters, result); return plugin.HandleRequest(immutable_facade, parameters, result);
} }
} // anon. ns } // anon. ns