Merge last trunk modifications

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

Former-commit-id: 14c192615a0b9b79121a8395e721978b72272536

2 files changed, 2 insertions, 2 deletions

diff --git a/src/GudhUI/utils/Edge_contractor.h b/src/GudhUI/utils/Edge_contractor.h
index 45079a40..8a29ff4b 100644
--- a/src/GudhUI/utils/Edge_contractor.h
+++ b/src/GudhUI/utils/Edge_contractor.h
@@ -65,7 +65,7 @@ template<typename SkBlComplex> class Edge_contractor {
 
     Placement_type operator()(const EdgeProfile& profile) const override {
       std::vector<double> mid_coords(profile.p0().dimension(), 0);
-      for (size_t i = 0; i < profile.p0().dimension(); ++i) {
+      for (int i = 0; i < profile.p0().dimension(); ++i) {
         mid_coords[i] = (profile.p0()[i] + profile.p1()[i]) / 2.;
       }
       return Point(profile.p0().dimension(), mid_coords.begin(), mid_coords.end());
diff --git a/src/GudhUI/utils/Furthest_point_epsilon_net.h b/src/GudhUI/utils/Furthest_point_epsilon_net.h
index f2a216f6..98346daa 100644
--- a/src/GudhUI/utils/Furthest_point_epsilon_net.h
+++ b/src/GudhUI/utils/Furthest_point_epsilon_net.h
@@ -73,7 +73,7 @@ template<typename SkBlComplex> class Furthest_point_epsilon_net {
       complex_(complex) {
     if (!complex.empty()) {
       init_filtration();
-      for (int k = 2; k < net_filtration_.size(); ++k) {
+      for (std::size_t k = 2; k < net_filtration_.size(); ++k) {
         update_radius_value(k);
       }
     }