type.hh (dune-geometry-2.6.0rc1) | : | type.hh (dune-geometry-2.6.0) | ||
---|---|---|---|---|

skipping to change at line 259 | skipping to change at line 259 | |||

* | * | |||

* GeometryType is a C++ "literal type" and can be used in `constexpr` context if created | * GeometryType is a C++ "literal type" and can be used in `constexpr` context if created | |||

* with a `constexpr` constructor. | * with a `constexpr` constructor. | |||

* | * | |||

* \ingroup GeometryType | * \ingroup GeometryType | |||

*/ | */ | |||

class GeometryType | class GeometryType | |||

{ | { | |||

public: | public: | |||

#pragma GCC diagnostic push | ||||

#pragma GCC diagnostic ignored "-Wdeprecated-declarations" | ||||

/** \brief Each entity can be tagged by one of these basic types | /** \brief Each entity can be tagged by one of these basic types | |||

* plus its space dimension */ | * plus its space dimension */ | |||

enum | enum | |||

DUNE_DEPRECATED_MSG("BasicType is deprecated and will be removed after DUNE 2.6") | ||||

BasicType { | BasicType { | |||

simplex, //!< Simplicial element in any nonnegative dimension | simplex, //!< Simplicial element in any nonnegative dimension | |||

cube, //!< Cube element in any nonnegative dimension | cube, //!< Cube element in any nonnegative dimension | |||

pyramid, //!< Four sided pyramid in three dimensions | pyramid, //!< Four sided pyramid in three dimensions | |||

prism, //!< Prism element in three dimensions | prism, //!< Prism element in three dimensions | |||

extended, //!< Other, more general topology, representable as topolog yId | extended, //!< Other, more general topology, representable as topolog yId | |||

none //!< Even more general topology, cannot be specified by a t opologyId. Two GeometryTypes with 'none' type are equal if and only if they have the same dimension. | none //!< Even more general topology, cannot be specified by a t opologyId. Two GeometryTypes with 'none' type are equal if and only if they have the same dimension. | |||

}; | }; | |||

#pragma GCC diagnostic pop | ||||

private: | private: | |||

/** \brief Topology Id element */ | /** \brief Topology Id element */ | |||

unsigned int topologyId_; | unsigned int topologyId_; | |||

/** \brief Dimension of the element */ | /** \brief Dimension of the element */ | |||

unsigned char dim_ : 7; | unsigned char dim_ : 7; | |||

/** \brief bool if this is none-type */ | /** \brief bool if this is none-type */ | |||

End of changes. 3 change blocks. | ||||

4 lines changed or deleted | | 0 lines changed or added |