diff --git a/CHANGELOG.md b/CHANGELOG.md index cc561bbb76d..f372ccd4ec8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - NodeJS: - FIXED: Support `skip_waypoints` in Node bindings [#6060](https://github.com/Project-OSRM/osrm-backend/pull/6060) - Misc: + - CHANGED: Remove redundant nullptr check. [#6326](https://github.com/Project-OSRM/osrm-backend/pull/6326) - CHANGED: missing files list is included in exception message. [#5360](https://github.com/Project-OSRM/osrm-backend/pull/5360) - CHANGED: Do not use deprecated Callback::Call overload in Node bindings. [#6318](https://github.com/Project-OSRM/osrm-backend/pull/6318) - FIXED: Fix distance calculation consistency. [#6315](https://github.com/Project-OSRM/osrm-backend/pull/6315) diff --git a/include/util/deallocating_vector.hpp b/include/util/deallocating_vector.hpp index afc357f6f5b..484a51b1be8 100644 --- a/include/util/deallocating_vector.hpp +++ b/include/util/deallocating_vector.hpp @@ -236,11 +236,7 @@ template class DeallocatingVector // Delete[]'ing ptr's to all Buckets for (auto bucket : bucket_list) { - if (nullptr != bucket) - { - delete[] bucket; - bucket = nullptr; - } + delete[] bucket; } bucket_list.clear(); bucket_list.shrink_to_fit(); diff --git a/src/storage/storage.cpp b/src/storage/storage.cpp index 9494285abed..7c83888e5fd 100644 --- a/src/storage/storage.cpp +++ b/src/storage/storage.cpp @@ -312,7 +312,7 @@ std::vector> Storage::GetStaticFiles() { if (file.first == REQUIRED && !boost::filesystem::exists(file.second)) { - throw util::exception("Could not find required filed: " + std::get<1>(file).string()); + throw util::exception("Could not find required file(s): " + std::get<1>(file).string()); } } @@ -337,7 +337,7 @@ std::vector> Storage::GetUpdatableFiles { if (file.first == REQUIRED && !boost::filesystem::exists(file.second)) { - throw util::exception("Could not find required filed: " + std::get<1>(file).string()); + throw util::exception("Could not find required file(s): " + std::get<1>(file).string()); } }