Commit 1a0afaff authored by Steffen Müthing's avatar 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
parents 3f4e7f0b 28afff5c
Pipeline #6877 passed with stage
in 6 minutes and 9 seconds
......@@ -22,8 +22,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,11 +277,9 @@ namespace Dune
{
public:
DUNE_NO_DEPRECATED_BEGIN
/** \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
......@@ -290,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.
};
DUNE_NO_DEPRECATED_END
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