From 134da91fa816f8173c734c1c8af8bea6f7cfd4bb Mon Sep 17 00:00:00 2001 From: Nils Date: Sat, 15 Apr 2023 16:27:51 +0200 Subject: [PATCH 1/2] keep libosrm* (#6602) --- CHANGELOG.md | 1 + docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbff44b38..038a29fcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - NodeJS: - CHANGED: Use node-api instead of NAN. [#6452](https://github.com/Project-OSRM/osrm-backend/pull/6452) - Misc: + - CHANGED: keep libosrm* in the docker image for downstream linking [#6602](https://github.com/Project-OSRM/osrm-backend/pull/6602) - CHANGED: Move vector in CSVFilesParser instead copying it. [#6470](https://github.com/Project-OSRM/osrm-backend/pull/6470) - REMOVED: Get rid of unused functions in util/json_util.hpp. [#6446](https://github.com/Project-OSRM/osrm-backend/pull/6446) - FIXED: Apply workaround for Conan installation issue on CI. [#6442](https://github.com/Project-OSRM/osrm-backend/pull/6442) diff --git a/docker/Dockerfile b/docker/Dockerfile index a44d3319f..7bb158132 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -37,7 +37,7 @@ RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \ cd ../profiles && \ cp -r * /opt && \ strip /usr/local/bin/* && \ - rm -rf /src /usr/local/lib/libosrm* + rm -rf /src # Multistage build to reduce image size - https://docs.docker.com/engine/userguide/eng-image/multistage-build/#use-multi-stage-builds From 0ca913132acea46e0c56e4665af50d68f53eec68 Mon Sep 17 00:00:00 2001 From: Al <44423587+AlTimofeyev@users.noreply.github.com> Date: Sun, 16 Apr 2023 14:22:30 -0700 Subject: [PATCH 2/2] Added block_counter variable to a preprocessor check, minor bug. (#6596) --- CHANGELOG.md | 1 + include/util/range_table.hpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 038a29fcd..83e1fab4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ - FIXED: Typo in file name src/util/timed_historgram.cpp -> src/util/timed_histogram.cpp [#6428](https://github.com/Project-OSRM/osrm-backend/issues/6428) - CHANGED: Replace boost::string_ref with std::string_view [#6433](https://github.com/Project-OSRM/osrm-backend/pull/6433) - ADDED: Print tracebacks for Lua runtime errors [#6564](https://github.com/Project-OSRM/osrm-backend/pull/6564) + - FIXED: Added a variable to preprocessor guard in file osrm-backend/include/util/range_table.hpp to solve build error. [#6596](https://github.com/Project-OSRM/osrm-backend/pull/6596) - Routing: - FIXED: Fix adding traffic signal penalties during compression [#6419](https://github.com/Project-OSRM/osrm-backend/pull/6419) # 5.27.1 diff --git a/include/util/range_table.hpp b/include/util/range_table.hpp index 7bb6497c8..757462570 100644 --- a/include/util/range_table.hpp +++ b/include/util/range_table.hpp @@ -79,10 +79,10 @@ template class RangeTable unsigned last_length = 0; unsigned lengths_prefix_sum = 0; unsigned block_idx = 0; - unsigned block_counter = 0; BlockT block; #ifndef BOOST_ASSERT_IS_VOID unsigned block_sum = 0; + unsigned block_counter = 0; #endif for (const unsigned l : lengths) { @@ -109,7 +109,9 @@ template class RangeTable if (BLOCK_SIZE == block_idx) { diff_blocks.push_back(block); +#ifndef BOOST_ASSERT_IS_VOID block_counter++; +#endif } // we can only store strings with length 255