diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-03-07 22:14:35 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-03-07 22:14:35 +0000 |
| commit | 9cb13407792cfaea1e19779be2938bf2494351f1 (patch) | |
| tree | b82d85eb0bfaaae72797dcc322af6caa3ce58a93 /src/common | |
| parent | fd510e6380ec12f3c909ccff5ee78dd7d13b8855 (diff) | |
| parent | 877c7f1580b2a84dd89b9fb2d5920a21af014b20 (diff) | |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/gudhi_doc_2.0.0@2175 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: b9b7b4ead23265e8d94ff2fdbae1df2a0d675c92
Diffstat (limited to 'src/common')
| -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..7bf97c23 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.; |