diff options
| author | Lev Dragunov <l.dragunov@corp.mail.ru> | 2015-02-24 16:13:08 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:37:41 +0300 |
| commit | 7dc3d2e13a3c715cebf0a67ade839738708eab27 (patch) | |
| tree | 4da3ff94100d9ed837ddc248b8db498d60287f9c /3party/osrm | |
| parent | c8fa5b9ae92bbbb2d7aeb248f7c1c8968d7662ba (diff) | |
OSRM build fixes
Diffstat (limited to '3party/osrm')
| -rw-r--r-- | 3party/osrm/osrm-backend/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | 3party/osrm/osrm-backend/mapsme/converter.cpp | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/3party/osrm/osrm-backend/CMakeLists.txt b/3party/osrm/osrm-backend/CMakeLists.txt index d1fe801a45..a188fbe3f5 100644 --- a/3party/osrm/osrm-backend/CMakeLists.txt +++ b/3party/osrm/osrm-backend/CMakeLists.txt @@ -196,9 +196,13 @@ target_link_libraries(osrm-mapsme ${Boost_LIBRARIES} OSRM debug "${CMAKE_SOURCE_DIR}/../../../../omim-build-debug/out/debug/libcoding.a" "${CMAKE_SOURCE_DIR}/../../../../omim-build-debug/out/debug/libbase.a" "${CMAKE_SOURCE_DIR}/../../../../omim-build-debug/out/debug/librouting.a" + "${CMAKE_SOURCE_DIR}/../../../../omim-build-debug/out/debug/libindexer.a" + "${CMAKE_SOURCE_DIR}/../../../../omim-build-debug/out/debug/libgeometry.a" general "${CMAKE_SOURCE_DIR}/../../../../omim-build-release/out/release/libcoding.a" "${CMAKE_SOURCE_DIR}/../../../../omim-build-release/out/release/libbase.a" - "${CMAKE_SOURCE_DIR}/../../../../omim-build-release/out/release/librouting.a") + "${CMAKE_SOURCE_DIR}/../../../../omim-build-release/out/release/librouting.a" + "${CMAKE_SOURCE_DIR}/../../../../omim-build-release/out/release/libindexer.a" + "${CMAKE_SOURCE_DIR}/../../../../omim-build-release/out/release/libgeometry.a") find_package(Threads REQUIRED) target_link_libraries(osrm-extract ${CMAKE_THREAD_LIBS_INIT} ${OPTIONAL_OMP_LIB}) diff --git a/3party/osrm/osrm-backend/mapsme/converter.cpp b/3party/osrm/osrm-backend/mapsme/converter.cpp index 38b7c39169..307c1d32f1 100644 --- a/3party/osrm/osrm-backend/mapsme/converter.cpp +++ b/3party/osrm/osrm-backend/mapsme/converter.cpp @@ -151,14 +151,14 @@ void GenerateRoutingIndex(const std::string & fPath) CHECK(data.shortcut == shortcuts.back(), ()); auto const last = edgesData.back(); - if (data.distance <= last) + if (static_cast<uint32_t>(data.distance) <= last) { if (!edgeId.empty() && data.shortcut) { CHECK(shortcuts.back(), ()); unsigned oldId = node - bits::ZigZagDecode(edgeId.back()); - if (data.distance == last) + if (static_cast<uint32_t>(data.distance) == last) edgeId.back() = compressId(min(oldId, data.id)); else edgeId.back() = compressId(data.id); @@ -266,7 +266,6 @@ void GenerateRoutingIndex(const std::string & fPath) std::cout << "Check edges data ..."; bool error = false; - typedef vector<QueryEdge::EdgeData> EdgeDataT; assert(facade.GetNumberOfEdges() == facadeNew.GetNumberOfEdges()); for (uint32_t i = 0; i < facade.GetNumberOfNodes(); ++i) { |