Commit 44679025 authored by Markus Blatt's avatar Markus Blatt
Browse files

Merge branch 'cherry-pick-8a765857' into 'releases/2.8'

Merge branch 'feature/shut-up-compiler-warnings' into 'master'

See merge request !182
parents 78e6a14d d6d92874
Pipeline #38336 passed with stage
in 20 minutes and 59 seconds
......@@ -272,7 +272,7 @@ namespace Dune {
return true;
}
friend Dune::Transitional::ReferenceElement< ctype, Dim<dim> > referenceElement ( const AxisAlignedCubeGeometry &geometry )
friend Dune::Transitional::ReferenceElement< ctype, Dim<dim> > referenceElement ( const AxisAlignedCubeGeometry & /* geometry */ )
{
return ReferenceElements< ctype, dim >::cube();
}
......
......@@ -438,7 +438,7 @@ namespace Dune
// integral type.
static unsigned int toUnsignedInt(unsigned int i) { return i; }
template<unsigned int v>
static unsigned int toUnsignedInt(std::integral_constant<unsigned int,v> i) { return v; }
static unsigned int toUnsignedInt(std::integral_constant<unsigned int,v> ) { return v; }
TopologyId topologyId ( std::integral_constant< bool, true > ) const { return TopologyId(); }
unsigned int topologyId ( std::integral_constant< bool, false > ) const { return refElement().type().id(); }
......@@ -722,8 +722,8 @@ namespace Dune
template< class ct, int mydim, int cdim, class Traits >
template< bool add, class CornerIterator >
inline void MultiLinearGeometry< ct, mydim, cdim, Traits >
::global ( TopologyId topologyId, std::integral_constant< int, 0 >,
CornerIterator &cit, const ctype &df, const LocalCoordinate &x,
::global ( TopologyId, std::integral_constant< int, 0 >,
CornerIterator &cit, const ctype &, const LocalCoordinate &,
const ctype &rf, GlobalCoordinate &y )
{
const GlobalCoordinate &origin = *cit;
......@@ -838,9 +838,9 @@ namespace Dune
template< class ct, int mydim, int cdim, class Traits >
template< bool add, int rows, class CornerIterator >
inline void MultiLinearGeometry< ct, mydim, cdim, Traits >
::jacobianTransposed ( TopologyId topologyId, std::integral_constant< int, 0 >,
CornerIterator &cit, const ctype &df, const LocalCoordinate &x,
const ctype &rf, FieldMatrix< ctype, rows, cdim > &jt )
::jacobianTransposed ( TopologyId, std::integral_constant< int, 0 >,
CornerIterator &cit, const ctype &, const LocalCoordinate &,
const ctype &, FieldMatrix< ctype, rows, cdim > & )
{
++cit;
}
......@@ -879,7 +879,7 @@ namespace Dune
template< class ct, int mydim, int cdim, class Traits >
template< class CornerIterator >
inline bool MultiLinearGeometry< ct, mydim, cdim, Traits >
::affine ( TopologyId topologyId, std::integral_constant< int, 0 >, CornerIterator &cit, JacobianTransposed &jt )
::affine ( TopologyId, std::integral_constant< int, 0 >, CornerIterator &cit, JacobianTransposed & )
{
++cit;
return true;
......
......@@ -339,7 +339,7 @@ namespace Dune {
private:
enum { dim = 0 };
friend class QuadratureRules<ctype, dim>;
static unsigned maxOrder(const GeometryType &t, QuadratureType::Enum qt)
static unsigned maxOrder(const GeometryType &t, QuadratureType::Enum)
{
if (t.isVertex())
{
......@@ -347,7 +347,7 @@ namespace Dune {
}
DUNE_THROW(Exception, "Unknown GeometryType");
}
static QuadratureRule<ctype, dim> rule(const GeometryType& t, int p, QuadratureType::Enum qt)
static QuadratureRule<ctype, dim> rule(const GeometryType& t, int , QuadratureType::Enum)
{
if (t.isVertex())
{
......
......@@ -86,7 +86,7 @@ namespace Dune {
}
#else
template<typename type>
QuadratureRule<ct,1> UseLapackOrError( int const degree, int const alpha)
QuadratureRule<ct,1> UseLapackOrError( int const, int const)
{
DUNE_THROW(NotImplemented, "LAPACK must be enable to use JacobiN quadrature rules.");
}
......
......@@ -167,7 +167,7 @@ namespace Dune {
};
template<typename ct>
PrismQuadratureRule<ct,3>::PrismQuadratureRule(int p) : QuadratureRule<ct,3>(GeometryTypes::prism)
PrismQuadratureRule<ct,3>::PrismQuadratureRule(int /* p */) : QuadratureRule<ct,3>(GeometryTypes::prism)
{
int m=6;
this->delivered_order = PrismQuadraturePointsSingleton<3>::prqp.order(m);
......
......@@ -756,8 +756,8 @@ namespace Dune
for(std::size_t cc=0; cc<= dim; ++cc)
{
containsSubentity_[cc].reset();
for(std::size_t i=0; i<std::size_t(size(cc)); ++i)
containsSubentity_[cc][number(i,cc)] = true;
for(std::size_t idx=0; idx<std::size_t(size(cc)); ++idx)
containsSubentity_[cc][number(idx,cc)] = true;
}
}
......
......@@ -197,7 +197,7 @@ static bool testAffineGeometry ()
return pass;
}
int main ( int argc, char **argv )
int main ( int /* argc */, char ** /* argv */ )
{
bool pass = true;
......
......@@ -110,7 +110,7 @@ void testCodimNonZero(int& result)
}
int main (int argc , char **argv) try
int main (int /* argc */ , char ** /* argv */) try
{
// 77 means "SKIP"
int result = 77;
......
......@@ -4,7 +4,7 @@
#include <dune/geometry/type.hh>
int main ( int argc, char **argv )
int main ( int /* argc */, char ** /* argv */ )
{
constexpr auto gt_none_1 = Dune::GeometryType();
constexpr auto gt_none_2 = Dune::GeometryTypes::none(0);
......
......@@ -15,7 +15,7 @@ struct Foo
}
};
int main(int argc, char** argv)
int main(int /* argc */, char** /* argv */)
{
// make sure we can correctly roundtrip between GeometryType
......
......@@ -136,7 +136,7 @@ template< class ctype, int mydim, int cdim, class Traits >
static bool testMultiLinearGeometry ( Dune::Transitional::ReferenceElement< ctype, Dune::Dim<mydim> > refElement,
const Dune::FieldMatrix< ctype, mydim, mydim > &A,
const Dune::FieldMatrix< ctype, cdim, cdim > &B,
const Traits &traits )
const Traits & /* traits */ )
{
bool pass = true;
......@@ -283,7 +283,7 @@ static bool testMultiLinearGeometry ( Dune::GeometryType gt,
}
template<class ctype, class Traits>
static bool testNonLinearGeometry(const Traits &traits)
static bool testNonLinearGeometry(const Traits & /* traits */)
{
const unsigned dim = 2;
typedef Dune::FieldVector<ctype,dim> Vector;
......@@ -445,7 +445,7 @@ static bool testMultiLinearGeometry ( const Traits& traits )
return pass;
}
int main ( int argc, char **argv )
int main ( int /* argc */, char ** /* argv */)
{
bool pass = true;
......
......@@ -4,7 +4,7 @@
#include <dune/geometry/type.hh>
int main ( int argc, char **argv )
int main ( int /* argc */, char ** /* argv */ )
{
int fail = 0;
for( int dim = 0; dim < 10; ++dim )
......
......@@ -136,7 +136,7 @@ void testStaticRefinementGeometry(int &result, Dune::RefinementIntervals tag, st
}
int main(int argc, char** argv) try
int main(int /* argc */, char** /* argv */) try
{
// 77 means 'SKIP'
int result = 77;
......
......@@ -248,8 +248,8 @@ namespace Dune
* the TypologyType, users are encouraged to use the
* GeometryType(TopologyType t) constructor.
*/
constexpr GeometryType(unsigned int topologyId, unsigned int dim, bool none)
: dim_(dim), none_(none), topologyId_(topologyId)
constexpr GeometryType(unsigned int topologyId, unsigned int dim, bool isNone)
: dim_(dim), none_(isNone), topologyId_(topologyId)
{}
/** \brief Constructor, using the topologyId (integer) and the dimension
......
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