From 85cef7e37c7ff8295f644c871100efc3e9a271c8 Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Wed, 9 Sep 2015 18:12:31 +0200 Subject: [PATCH] Revert parallelization on util that is used in the server. Let node do this. This reverts @6b2bf49 on the server component utils. --- util/container.hpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/util/container.hpp b/util/container.hpp index 166561d8e..d455e94e2 100644 --- a/util/container.hpp +++ b/util/container.hpp @@ -28,12 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef CONTAINER_HPP #define CONTAINER_HPP -#include - #include #include #include -#include namespace osrm { @@ -52,7 +49,7 @@ constexpr bool has_resize_method(...) noexcept { return false; } template void sort_unique_resize(Container &vector) noexcept { - tbb::parallel_sort(vector); + std::sort(std::begin(vector), std::end(vector)); const auto number_of_unique_elements = std::unique(std::begin(vector), std::end(vector)) - std::begin(vector); if (detail::has_resize_method(vector))