Merge last trunk modifications

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@2174 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 50c9f69ac71c817ed8b9e61b81be6547bf89a4b0

1 files changed, 8 insertions, 0 deletions

diff --git a/src/Bottleneck_distance/include/gudhi/Persistence_graph.h b/src/Bottleneck_distance/include/gudhi/Persistence_graph.h
index c7695112..44f4b827 100644
--- a/src/Bottleneck_distance/include/gudhi/Persistence_graph.h
+++ b/src/Bottleneck_distance/include/gudhi/Persistence_graph.h
@@ -25,6 +25,10 @@
 
 #include <gudhi/Internal_point.h>
 
+#ifdef GUDHI_USE_TBB
+#include <tbb/parallel_sort.h>
+#endif
+
 #include <vector>
 #include <algorithm>
 #include <limits>  // for numeric_limits
@@ -144,7 +148,11 @@ inline std::vector<double> Persistence_graph::sorted_distances() const {
     for (int v_point_index = 0; v_point_index < size(); ++v_point_index)
       distances.push_back(distance(u_point_index, v_point_index));
   }
+#ifdef GUDHI_USE_TBB
+  tbb::parallel_sort(distances.begin(), distances.end());
+#else
   std::sort(distances.begin(), distances.end());
+#endif
   return distances;
 }