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

Added block_counter variable to a preprocessor check, minor bug. (#6596)

Browse Source
This commit is contained in:
Al 2023-04-16 14:22:30 -07:00 committed by GitHub
parent 134da91fa8
commit 0ca913132a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -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) - 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) - 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) - 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: - Routing:
- FIXED: Fix adding traffic signal penalties during compression [#6419](https://github.com/Project-OSRM/osrm-backend/pull/6419) - FIXED: Fix adding traffic signal penalties during compression [#6419](https://github.com/Project-OSRM/osrm-backend/pull/6419)
# 5.27.1 # 5.27.1

4
include/util/range_table.hpp
View File

@ -79,10 +79,10 @@ template <unsigned BLOCK_SIZE, storage::Ownership Ownership> class RangeTable
unsigned last_length = 0; unsigned last_length = 0;
unsigned lengths_prefix_sum = 0; unsigned lengths_prefix_sum = 0;
unsigned block_idx = 0; unsigned block_idx = 0;
unsigned block_counter = 0;
BlockT block; BlockT block;
#ifndef BOOST_ASSERT_IS_VOID #ifndef BOOST_ASSERT_IS_VOID
unsigned block_sum = 0; unsigned block_sum = 0;
unsigned block_counter = 0;
#endif #endif
for (const unsigned l : lengths) for (const unsigned l : lengths)
{ {
@ -109,7 +109,9 @@ template <unsigned BLOCK_SIZE, storage::Ownership Ownership> class RangeTable
if (BLOCK_SIZE == block_idx) if (BLOCK_SIZE == block_idx)
{ {
diff_blocks.push_back(block); diff_blocks.push_back(block);
#ifndef BOOST_ASSERT_IS_VOID
block_counter++; block_counter++;
#endif
} }
// we can only store strings with length 255 // we can only store strings with length 255