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

Merge branch 'develop' of github.com:Project-OSRM/osrm-backend into develop

Browse Source
This commit is contained in:
Dennis Luxen 2014-10-20 12:54:12 +02:00
commit c8cd8775f6
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DataStructures/StaticRTree.h
View File

@ -890,7 +890,7 @@ class StaticRTree
if (current_query_node.RepresentsTreeNode()) if (current_query_node.RepresentsTreeNode())
{ {
const TreeNode & current_tree_node = boost::get<TreeNode>(current_query_node.node); const TreeNode & current_tree_node = current_query_node.node.template get<TreeNode>();
if (current_tree_node.child_is_on_disk) if (current_tree_node.child_is_on_disk)
{ {
LeafNode current_leaf_node; LeafNode current_leaf_node;
@ -939,7 +939,7 @@ class StaticRTree
{ {
++inspected_segments; ++inspected_segments;
// inspecting an actual road segment // inspecting an actual road segment
const EdgeDataT & current_segment = boost::get<EdgeDataT>(current_query_node.node); const EdgeDataT & current_segment = current_query_node.node.template get<EdgeDataT>();
// don't collect too many results from small components // don't collect too many results from small components
if (number_of_results_found_in_big_cc == number_of_results && !current_segment.is_in_tiny_cc) if (number_of_results_found_in_big_cc == number_of_results && !current_segment.is_in_tiny_cc)

4
Util/BoostFileSystemFix.h
View File

@ -30,9 +30,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "OSRMException.h" #include "OSRMException.h"
#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>
// This is one big workaround for latest boost renaming woes. // This is one big workaround for latest boost renaming woes.

1
Util/StringUtil.h
View File

@ -146,6 +146,7 @@ inline std::size_t URIDecode(const std::string &input, std::string &output)
inline std::size_t URIDecodeInPlace(std::string &URI) { return URIDecode(URI, URI); } inline std::size_t URIDecodeInPlace(std::string &URI) { return URIDecode(URI, URI); }
// TODO: remove after switch to libosmium
inline bool StringStartsWith(const std::string &input, const std::string &prefix) inline bool StringStartsWith(const std::string &input, const std::string &prefix)
{ {
return boost::starts_with(input, prefix); return boost::starts_with(input, prefix);