diff options
| author | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-03-26 11:32:25 +0000 |
|---|---|---|
| committer | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-03-26 11:32:25 +0000 |
| commit | 1208d423e700764a3453767886e6a3b4c0a09125 (patch) | |
| tree | 3e938a2e1e984e80e1137fd30968e385068ec8e4 /src/common/include | |
| parent | 6f9560fe6d6cca6c5a0de35fcf7938912e103930 (diff) | |
| parent | 6ed42daddfede2288bc02ab2e98fc12b47cac74e (diff) | |
merge from trunk
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/farthest_distance@2244 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 7d261d59dae839dd5de8f6a03c5a167d015f7d85
Diffstat (limited to 'src/common/include')
| -rw-r--r-- | src/common/include/gudhi/distance_functions.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/include/gudhi/distance_functions.h b/src/common/include/gudhi/distance_functions.h index 5891ef0e..22747637 100644 --- a/src/common/include/gudhi/distance_functions.h +++ b/src/common/include/gudhi/distance_functions.h @@ -24,6 +24,8 @@ #define DISTANCE_FUNCTIONS_H_ #include <cmath> // for std::sqrt +#include <type_traits> // for std::decay +#include <iterator> // for std::begin, std::end /** @file * @brief Global distance functions @@ -34,7 +36,7 @@ class Euclidean_distance { public: template< typename Point > - auto operator()(const Point& p1, const Point& p2) -> typename std::decay<decltype(*std::begin(p1))>::type { + auto operator()(const Point& p1, const Point& p2) const -> typename std::decay<decltype(*std::begin(p1))>::type { auto it1 = p1.begin(); auto it2 = p2.begin(); typename Point::value_type dist = 0.; |