From 79425a986879662b217672cf693e3ca570e501ee Mon Sep 17 00:00:00 2001 From: glisse Date: Wed, 2 Sep 2015 09:07:41 +0000 Subject: 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 --- src/Simplex_tree/include/gudhi/Simplex_tree.h | 4 ++-- .../include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/Simplex_tree') 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 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; -- cgit v1.2.3