diff options
| author | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-09-02 09:07:41 +0000 |
|---|---|---|
| committer | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-09-02 09:07:41 +0000 |
| commit | 79425a986879662b217672cf693e3ca570e501ee (patch) | |
| tree | 621f2381620916c42c1609d421cb34039c5d0909 | |
| parent | 436bd9f4465e75d1d35f31f239537e227beafd2a (diff) | |
constexpr is only supported in extremely recent VS.
Unnecessary "public:".
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST-options@769 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 62c7733f0d3236a0d919be049dc09b824435a198
| -rw-r--r-- | src/Simplex_tree/include/gudhi/Simplex_tree.h | 4 | ||||
| -rw-r--r-- | src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h index bf9b3e13..aeb0364f 100644 --- a/src/Simplex_tree/include/gudhi/Simplex_tree.h +++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h @@ -80,8 +80,8 @@ struct Simplex_tree_options_full_featured { typedef int Vertex_handle; typedef double Filtration_value; typedef int Simplex_key; - static constexpr bool store_key = true; - static constexpr bool store_filtration = true; + static const bool store_key = true; + static const bool store_filtration = true; }; /** diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h index 26d18098..c49e30b9 100644 --- a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h +++ b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h @@ -40,7 +40,6 @@ namespace Gudhi { */ template<class SimplexTree> struct Simplex_tree_node_explicit_storage : SimplexTree::Filtration_simplex_base, SimplexTree::Key_simplex_base { - public: typedef typename SimplexTree::Siblings Siblings; typedef typename SimplexTree::Filtration_value Filtration_value; typedef typename SimplexTree::Simplex_key Simplex_key; |