Merged with trunk + minor changes

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

Former-commit-id: 6b23778cbe43e7697cd325039e843758a263d927

1 files changed, 4 insertions, 2 deletions

diff --git a/src/Bottleneck_distance/example/bottleneck_basic_example.cpp b/src/Bottleneck_distance/example/bottleneck_basic_example.cpp
index 91a7302f..d0ca4e20 100644
--- a/src/Bottleneck_distance/example/bottleneck_basic_example.cpp
+++ b/src/Bottleneck_distance/example/bottleneck_basic_example.cpp
@@ -21,10 +21,13 @@
  */
 
 #include <gudhi/Bottleneck.h>
+
 #include <iostream>
+#include <vector>
+#include <utility>  // for pair
+#include <limits>  // for numeric_limits
 
 int main() {
-
   std::vector< std::pair<double, double> > v1, v2;
 
   v1.emplace_back(2.7, 3.7);
@@ -44,5 +47,4 @@ int main() {
   b = Gudhi::persistence_diagram::bottleneck_distance(v1, v2, 0.1);
 
   std::cout << "Approx bottleneck distance = " << b << std::endl;
-
 }