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

Revert parallelization on util that is used in the server. Let node do this.

Browse Source 
This reverts @6b2bf49 on the server component utils.
This commit is contained in:
Daniel J. Hofmann 2015-09-09 18:12:31 +02:00
parent c526bec798
commit 85cef7e37c
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/container.hpp
View File

@ -28,12 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef CONTAINER_HPP #ifndef CONTAINER_HPP
#define CONTAINER_HPP #define CONTAINER_HPP
#include <tbb/parallel_sort.h>
#include <algorithm> #include <algorithm>
#include <iterator> #include <iterator>
#include <vector> #include <vector>
#include <utility>
namespace osrm namespace osrm
{ {
@ -52,7 +49,7 @@ constexpr bool has_resize_method(...) noexcept { return false; }
template <typename Container> void sort_unique_resize(Container &vector) noexcept template <typename Container> 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 = const auto number_of_unique_elements =
std::unique(std::begin(vector), std::end(vector)) - std::begin(vector); std::unique(std::begin(vector), std::end(vector)) - std::begin(vector);
if (detail::has_resize_method(vector)) if (detail::has_resize_method(vector))