make the coding style of femcpgridcompat.hh consistent with the rest of eWoms/ebos

This commit is contained in:
Andreas Lauser
2019-02-01 17:33:30 +01:00
parent fb34eb304c
commit 0aa9a2c6b8

View File

@@ -37,11 +37,8 @@
#include <dune/fem/misc/compatibility.hh>
#include <dune/fem/io/streams/streams.hh>
namespace Dune
{
namespace cpgrid
{
namespace Dune {
namespace cpgrid {
template <int codim>
class Entity;
@@ -53,14 +50,11 @@ namespace Dune
template <int dim, int cdim>
auto referenceElement(const Dune::cpgrid::Geometry<dim, cdim>& geo)
-> decltype(referenceElement<double, dim>(geo.type()))
{
return referenceElement<double, dim>(geo.type());
}
{ return referenceElement<double, dim>(geo.type()); }
#endif
// specialization of dune-fem compatiblity functions for CpGrid, since CpGrid does not use the interface classes.
namespace Fem
{
namespace Fem {
////////////////////////////////////////////////////////////
//
@@ -69,15 +63,11 @@ namespace Dune
////////////////////////////////////////////////////////////
template <int codim>
inline Dune::cpgrid::Entity<codim> make_entity(const Dune::cpgrid::EntityPointer<codim>& entityPointer)
{
return *entityPointer;
}
{ return *entityPointer; }
template <int codim>
inline Dune::cpgrid::Entity<codim> make_entity(Dune::cpgrid::Entity<codim> entity)
{
return std::move( entity );
}
{ return std::move(entity); }
////////////////////////////////////////////////////////////
//
@@ -87,14 +77,11 @@ namespace Dune
template<int codim>
struct GridEntityAccess<Dune::cpgrid::Entity<codim> >
{
typedef Dune::cpgrid::Entity<codim> EntityType;
typedef EntityType GridEntityType;
static const GridEntityType& gridEntity(const EntityType& entity)
{
return entity;
}
{ return entity; }
};
} // namespace Fem