Commit c807c2bb authored by Steffen Müthing's avatar Steffen Müthing Committed by Steffen Müthing

Merge branch 'bugfix/revert-basictype-deprecation-for-2.6' into 'master'

Revert deprecation of GeometryType::BasicType for 2.6

See merge request !88

(cherry picked from commit 1a0afaff)
parent 8e062a31
Pipeline #6880 passed with stage
in 6 minutes and 32 seconds
......@@ -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.
......
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment