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

Fix build

Browse Source
This commit is contained in:
Patrick Niklaus 2015-12-15 16:31:28 +01:00
parent 53cee90933
commit 1264983688
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/datastore_options.hpp
View File

@ -33,16 +33,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "osrm_exception.hpp" #include "osrm_exception.hpp"
#include "simple_logger.hpp" #include "simple_logger.hpp"
#include <osrm/server_paths.hpp>
#include <boost/any.hpp> #include <boost/any.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include <string> #include <string>
#include <unordered_map>
// generate boost::program_options object for the routing part // generate boost::program_options object for the routing part
bool GenerateDataStoreOptions(const int argc, const char *argv[], ServerPaths &paths) bool GenerateDataStoreOptions(const int argc, const char *argv[], std::unordered_map<std::string, boost::filesystem::path> &paths)
{ {
// declare a group of options that will be allowed only on command line // declare a group of options that will be allowed only on command line
boost::program_options::options_description generic_options("Options"); boost::program_options::options_description generic_options("Options");

7
util/routed_options.hpp
View File

@ -36,15 +36,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/any.hpp> #include <boost/any.hpp>
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include <osrm/server_paths.hpp> #include <unordered_map>
#include <fstream> #include <fstream>
#include <string> #include <string>
const static unsigned INIT_OK_START_ENGINE = 0; const static unsigned INIT_OK_START_ENGINE = 0;
const static unsigned INIT_OK_DO_NOT_START_ENGINE = 1; const static unsigned INIT_OK_DO_NOT_START_ENGINE = 1;
const static unsigned INIT_FAILED = -1; const static unsigned INIT_FAILED = -1;
inline void populate_base_path(ServerPaths &server_paths) inline void populate_base_path(std::unordered_map<std::string, boost::filesystem::path> &server_paths)
{ {
// populate the server_path object // populate the server_path object
auto path_iterator = server_paths.find("base"); auto path_iterator = server_paths.find("base");
@ -138,7 +137,7 @@ inline void populate_base_path(ServerPaths &server_paths)
// generate boost::program_options object for the routing part // generate boost::program_options object for the routing part
inline unsigned GenerateServerProgramOptions(const int argc, inline unsigned GenerateServerProgramOptions(const int argc,
const char *argv[], const char *argv[],
ServerPaths &paths, std::unordered_map<std::string, boost::filesystem::path> &paths,
std::string &ip_address, std::string &ip_address,
int &ip_port, int &ip_port,
int &requested_num_threads, int &requested_num_threads,