Merge last trunk modifications

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

Former-commit-id: 951a081ac634f829fa49265005ea1e620f2c08ca

1 files changed, 3 insertions, 3 deletions

diff --git a/src/GudhUI/model/Model.h b/src/GudhUI/model/Model.h
index 77e37b6c..fc284cc6 100644
--- a/src/GudhUI/model/Model.h
+++ b/src/GudhUI/model/Model.h
@@ -187,7 +187,7 @@ class Model {
   }
 
   void contract_edges(unsigned num_contractions) {
-    Clock c;
+    Gudhi::Clock c;
     Edge_contractor<Complex> contractor(complex_, num_contractions);
     std::cout << "Time to simplify: " << c.num_seconds() << "s" << std::endl;
   }
@@ -248,7 +248,7 @@ class Model {
     unsigned num_simplices = 0;
     int euler = 0;
     int dimension = 0;
-    Clock clock;
+    Gudhi::Clock clock;
     for (const auto &s : complex_.complex_simplex_range()) {
       num_simplices++;
       dimension = (std::max)(s.dimension(), dimension);
@@ -271,7 +271,7 @@ class Model {
 #ifdef _WIN32
     std::cout << "Works only on linux x64 for the moment\n";
 #else
-    Clock clock;
+    Gudhi::Clock clock;
     run_chomp();
     clock.end();
 #endif