Fix rebase problems

This commit is contained in:
Pepijn Schoen
2017-05-23 17:37:41 +02:00
committed by Daniel J. H
parent 67fae1d1f0
commit 5a6dee80ac
5 changed files with 23 additions and 23 deletions
+5 -3
View File
@@ -38,11 +38,12 @@ struct IOConfig
mld_graph_path = {osrm_path.string() + ".mldgr"};
level_path = {osrm_path.string() + ".level"};
node_path = {osrm_path.string() + ".enw"};
edge_based_nodes_data_path = {osrm_path.string() + ".nodes_data"};
edge_based_nodes_data_path = {osrm_path.string() + ".ebg_nodes"};
node_based_nodes_data_path = {osrm_path.string() + ".nbg_nodes"};
edge_based_graph_path = {osrm_path.string() + ".ebg"};
compressed_node_based_graph_path = {osrm_path.string() + ".cnbg"};
cnbg_ebg_mapping_path = {osrm_path.string() + ".cnbg_to_ebg"};
restriction_path = {osrm_path.string() + ".restrictions"};
turn_restrictions_path = {osrm_path.string() + ".restrictions"};
intersection_class_data_path = {osrm_path.string() + ".icd"};
}
@@ -72,10 +73,11 @@ struct IOConfig
boost::filesystem::path level_path;
boost::filesystem::path node_path;
boost::filesystem::path edge_based_nodes_data_path;
boost::filesystem::path node_based_nodes_data_path;
boost::filesystem::path edge_based_graph_path;
boost::filesystem::path compressed_node_based_graph_path;
boost::filesystem::path cnbg_ebg_mapping_path;
boost::filesystem::path restriction_path;
boost::filesystem::path turn_restrictions_path;
boost::filesystem::path intersection_class_data_path;
};
}