merge from trunk

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

Former-commit-id: 81f81cb6b39ece77718c8b03d408a90789946c0f

2 files changed, 2 insertions, 2 deletions

diff --git a/src/cython/include/Alpha_complex_interface.h b/src/cython/include/Alpha_complex_interface.h
index 8cf527fc..faa059d1 100644
--- a/src/cython/include/Alpha_complex_interface.h
+++ b/src/cython/include/Alpha_complex_interface.h
@@ -60,7 +60,7 @@ class Alpha_complex_interface {
       Point_d ph = alpha_complex_->get_point(vh);
       for (auto coord = ph.cartesian_begin(); coord < ph.cartesian_end(); coord++)
         vd.push_back(*coord);
-    } catch (std::out_of_range outofrange) {
+    } catch (std::out_of_range const&) {
       // std::out_of_range is thrown in case not found. Other exceptions must be re-thrown
     }
     return vd;
diff --git a/src/cython/include/Nerve_gic_interface.h b/src/cython/include/Nerve_gic_interface.h
index 90edd544..aa71e2a6 100644
--- a/src/cython/include/Nerve_gic_interface.h
+++ b/src/cython/include/Nerve_gic_interface.h
@@ -47,7 +47,7 @@ class Nerve_gic_interface : public Cover_complex<std::vector<double>> {
     set_cover_from_Voronoi(Gudhi::Euclidean_distance(), m);
   }
   double set_graph_from_automatic_euclidean_rips(int N) {
-    set_graph_from_automatic_rips(Gudhi::Euclidean_distance(), N);
+    return set_graph_from_automatic_rips(Gudhi::Euclidean_distance(), N);
   }
   void set_graph_from_euclidean_rips(double threshold) {
     set_graph_from_rips(threshold, Gudhi::Euclidean_distance());