diff --git a/CHANGELOG.md b/CHANGELOG.md index d6bcd0ef6ee5f2bd9cc6734a355fbc688463622a..90dc37722bce5665a1cbb68f40662f5660c9a6b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,8 +20,8 @@ - There are new singletons and factory functions in the namespace `Dune::GeometryTypes`. These are now the official way to obtain a `GeometryType`. - - `GeometryType::BasicType` and the assorted constructor have been deprecated and will be removed - after the release of DUNE 2.6. + - The constructor taking a `GeometryType::BasicType` and a dimension has been deprecated and wil be + removed after the release of DUNE 2.6. - The assorted member functions `GeometryType::make...()` have been deprecated and will be removed after the release of DUNE 2.6. diff --git a/dune/geometry/type.hh b/dune/geometry/type.hh index 1835898d845c2880784ad3a3a55881f875798776..796c04a29469a2c4f4078ec4b5e77b7d6f9e65e7 100644 --- a/dune/geometry/type.hh +++ b/dune/geometry/type.hh @@ -277,12 +277,9 @@ namespace Dune { public: -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" /** \brief Each entity can be tagged by one of these basic types * plus its space dimension */ enum - DUNE_DEPRECATED_MSG("BasicType is deprecated and will be removed after DUNE 2.6") BasicType { simplex, //!< Simplicial element in any nonnegative dimension cube, //!< Cube element in any nonnegative dimension @@ -291,7 +288,6 @@ namespace Dune extended, //!< Other, more general topology, representable as topologyId none //!< Even more general topology, cannot be specified by a topologyId. Two GeometryTypes with 'none' type are equal if and only if they have the same dimension. }; -#pragma GCC diagnostic pop private: