diff --git a/include/quadrature/quadrature.h b/include/quadrature/quadrature.h index 294550ab9cc..aa66d5db852 100644 --- a/include/quadrature/quadrature.h +++ b/include/quadrature/quadrature.h @@ -160,7 +160,7 @@ class QBase : public ReferenceCountedObject * Initializes the data structures to contain a quadrature rule * for an object of type \p type. */ - void init (const ElemType _type=INVALID_ELEM, + void init (const ElemType type=INVALID_ELEM, unsigned int p_level=0); /** @@ -222,7 +222,7 @@ class QBase : public ReferenceCountedObject * weights vectors with the appropriate values. Generally this * is just one point with weight 1. */ - virtual void init_0D (const ElemType _type=INVALID_ELEM, + virtual void init_0D (const ElemType type=INVALID_ELEM, unsigned int p_level=0); /** @@ -232,7 +232,7 @@ class QBase : public ReferenceCountedObject * It is assumed that derived quadrature rules will at least * define the init_1D function, therefore it is pure virtual. */ - virtual void init_1D (const ElemType _type=INVALID_ELEM, + virtual void init_1D (const ElemType type=INVALID_ELEM, unsigned int p_level=0) = 0; /** diff --git a/src/quadrature/quadrature_clough_2D.C b/src/quadrature/quadrature_clough_2D.C index c5278f46a20..ecfad61db8b 100644 --- a/src/quadrature/quadrature_clough_2D.C +++ b/src/quadrature/quadrature_clough_2D.C @@ -25,7 +25,7 @@ namespace libMesh { -void QClough::init_2D(const ElemType _type, +void QClough::init_2D(const ElemType type_in, unsigned int p) { #if LIBMESH_DIM > 1 @@ -34,7 +34,7 @@ void QClough::init_2D(const ElemType _type, //----------------------------------------------------------------------- // 2D quadrature rules - switch (_type) + switch (type_in) { //--------------------------------------------- @@ -73,7 +73,7 @@ void QClough::init_2D(const ElemType _type, // Unsupported type default: { - libMesh::err << "Element type not supported!:" << _type << std::endl; + libMesh::err << "Element type not supported!:" << type_in << std::endl; libmesh_error(); } }