Merged latest trunk changes to my_branch and fix

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

Former-commit-id: 2463ee9b0f8b69e3edbda4e8189eb61606e0af93

2 files changed, 2 insertions, 2 deletions

diff --git a/src/common/include/gudhi/graph_simplicial_complex.h b/src/common/include/gudhi/graph_simplicial_complex.h
index e7a8cfe9..1ad9dabd 100644
--- a/src/common/include/gudhi/graph_simplicial_complex.h
+++ b/src/common/include/gudhi/graph_simplicial_complex.h
@@ -86,7 +86,7 @@ Graph_t compute_proximity_graph( PointCloud &points
   auto vertex_prop = boost::get(vertex_filtration_t(),skel_graph);
 
   boost::graph_traits<Graph_t>::vertex_iterator vi, vi_end;
-  for ( tie(vi, vi_end) = boost::vertices(skel_graph); 
+  for ( std::tie(vi, vi_end) = boost::vertices(skel_graph); 
         vi != vi_end; ++vi )
   { boost::put(vertex_prop, *vi, 0.); }
  
diff --git a/src/common/include/gudhi/reader_utils.h b/src/common/include/gudhi/reader_utils.h
index 83298f86..ab12c268 100644
--- a/src/common/include/gudhi/reader_utils.h
+++ b/src/common/include/gudhi/reader_utils.h
@@ -115,7 +115,7 @@ read_graph ( std::string file_name )
 
   boost::graph_traits<Graph_t>::vertex_iterator vi, vi_end;
   auto v_it = vertices.begin();
-  for (tie(vi, vi_end) = boost::vertices(skel_graph); vi != vi_end; ++vi,++v_it)
+  for (std::tie(vi, vi_end) = boost::vertices(skel_graph); vi != vi_end; ++vi,++v_it)
   { boost::put(vertex_prop, *vi, v_it->second); }
 
   return skel_graph;