From bd13c893ad2b0ce39ef3cf9bbe26bbca584762fb Mon Sep 17 00:00:00 2001
From: salinasd <salinasd@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Wed, 17 Dec 2014 10:17:53 +0000
Subject: problem des (std::max) sous VS13

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

Former-commit-id: 08e5d99027802c1337db98654f7cc2c4f401ceef
---
 src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp | 2 +-
 src/Simplex_tree/include/gudhi/Simplex_tree.h                      | 2 ++
 src/common/include/gudhi/reader_utils.h                            | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp b/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp
index 1b0cc152..f44045d0 100644
--- a/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp
+++ b/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp
@@ -130,7 +130,7 @@ void test_rips_persistence_in_dimension(int dimension) {
   std::cout << "********************************************************************" << std::endl;
   std::cout << "TEST OF RIPS_PERSISTENT_COHOMOLOGY_SINGLE_FIELD DIM=" << dimension << " MIN_PERS=Inf" << std::endl;
 
-  str_rips_persistence = test_rips_persistence(dimension, std::numeric_limits<int>::max());
+  str_rips_persistence = test_rips_persistence(dimension, (std::numeric_limits<int>::max)());
 
   BOOST_CHECK(str_rips_persistence.find(value0) == std::string::npos); // Check not found
   BOOST_CHECK(str_rips_persistence.find(value1) == std::string::npos); // Check not found
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
index 12be6e5d..2417313e 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h
@@ -115,7 +115,9 @@ class Simplex_tree {
   friend class Simplex_tree_boundary_simplex_iterator< Simplex_tree<FiltrationValue, SimplexKey, VertexHandle> >;
   friend class Simplex_tree_complex_simplex_iterator< Simplex_tree<FiltrationValue, SimplexKey, VertexHandle> >;
   friend class Simplex_tree_skeleton_simplex_iterator< Simplex_tree<FiltrationValue, SimplexKey, VertexHandle> >;
+
   template<class T1, class T2> friend class Persistent_cohomology;
+ 
 
   /* \brief Set of nodes sharing a same parent in the simplex tree. */
   typedef Simplex_tree_siblings<Simplex_tree, Dictionary> Siblings;
diff --git a/src/common/include/gudhi/reader_utils.h b/src/common/include/gudhi/reader_utils.h
index 5c8cbeb7..83298f86 100644
--- a/src/common/include/gudhi/reader_utils.h
+++ b/src/common/include/gudhi/reader_utils.h
@@ -145,7 +145,7 @@ bool read_simplex ( std::istream                 & in_
   for(int i=0; i<dim+1; ++i)
   { in_ >> v; simplex.push_back(v); }
   in_ >> fil;
-  in_.ignore(std::numeric_limits<std::streamsize>::max(), '\n'); // ignore until the carriage return
+  in_.ignore((std::numeric_limits<std::streamsize>::max)(), '\n'); // ignore until the carriage return
   return true;
 }
 
-- 
cgit v1.2.3