Merge of branch boost_system_no_deprecated_test in order to :

- remove boost_system library dependency
- repair conda package compilation issues found
- Use Gudhi::Clock instead of boost::date_time library



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

Former-commit-id: d68764ab186bd44f2b2253ba21ad1c0e09584455

1 files changed, 2 insertions, 2 deletions

diff --git a/src/Subsampling/include/gudhi/pick_n_random_points.h b/src/Subsampling/include/gudhi/pick_n_random_points.h
index f0e3f1f1..8c90b6bf 100644
--- a/src/Subsampling/include/gudhi/pick_n_random_points.h
+++ b/src/Subsampling/include/gudhi/pick_n_random_points.h
@@ -52,7 +52,7 @@ typename OutputIterator>
 void pick_n_random_points(Point_container const &points,
                           std::size_t final_size,
                           OutputIterator output_it) {
-#ifdef GUDHI_SUBS_PROFILING
+#ifdef GUDHI_SUBSAMPLING_PROFILING
   Gudhi::Clock t;
 #endif
 
@@ -72,7 +72,7 @@ void pick_n_random_points(Point_container const &points,
   for (int l : landmarks)
     *output_it++ = points[l];
 
-#ifdef GUDHI_SUBS_PROFILING
+#ifdef GUDHI_SUBSAMPLING_PROFILING
   t.end();
   std::cerr << "Random landmark choice took " << t.num_seconds()
       << " seconds." << std::endl;