Merge last trunk modifications

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

Former-commit-id: 8af39a00b9134dbcc77883412c29d7184479979b

1 files changed, 2 insertions, 2 deletions

diff --git a/src/Tangential_complex/benchmark/benchmark_tc.cpp b/src/Tangential_complex/benchmark/benchmark_tc.cpp
index 943fcb54..6d6dd548 100644
--- a/src/Tangential_complex/benchmark/benchmark_tc.cpp
+++ b/src/Tangential_complex/benchmark/benchmark_tc.cpp
@@ -161,7 +161,7 @@ typename Kernel, typename OutputIteratorPoints>
 bool load_points_from_file(
                            const std::string &filename,
                            OutputIteratorPoints points,
-                           std::size_t only_first_n_points = std::numeric_limits<std::size_t>::max()) {
+                           std::size_t only_first_n_points = (std::numeric_limits<std::size_t>::max)()) {
   typedef typename Kernel::Point_d Point;
 
   std::ifstream in(filename);
@@ -196,7 +196,7 @@ bool load_points_and_tangent_space_basis_from_file(
                                                    OutputIteratorPoints points,
                                                    OutputIteratorTS tangent_spaces,
                                                    int intrinsic_dim,
-                                                   std::size_t only_first_n_points = std::numeric_limits<std::size_t>::max()) {
+                                                   std::size_t only_first_n_points = (std::numeric_limits<std::size_t>::max)()) {
   typedef typename Kernel::Point_d Point;
   typedef typename Kernel::Vector_d Vector;