diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-03-28 10:32:51 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-03-28 10:32:51 +0000 |
| commit | 4540f8841fa9b8846012dc3cc7e8a20007d1a97f (patch) | |
| tree | 4cdd6f0861eca43e1583948c471a0b9679759c36 /src/common/include/gudhi/distance_functions.h | |
| parent | f0e209149a6bf1d3b13572f3704986a429130a48 (diff) | |
| parent | 6ed42daddfede2288bc02ab2e98fc12b47cac74e (diff) | |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@2263 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 9b430e79ecc94bee975d748eb3e2106c7dbab3ce
Diffstat (limited to 'src/common/include/gudhi/distance_functions.h')
| -rw-r--r-- | src/common/include/gudhi/distance_functions.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/include/gudhi/distance_functions.h b/src/common/include/gudhi/distance_functions.h index 7bf97c23..22747637 100644 --- a/src/common/include/gudhi/distance_functions.h +++ b/src/common/include/gudhi/distance_functions.h @@ -24,8 +24,8 @@ #define DISTANCE_FUNCTIONS_H_ #include <cmath> // for std::sqrt -#include <type_traits> // for std::decay -#include <iterator> // for std::begin, std::end +#include <type_traits> // for std::decay +#include <iterator> // for std::begin, std::end /** @file * @brief Global distance functions |