From 5853a77b9ba1e49089693b7614250f9660bcc819 Mon Sep 17 00:00:00 2001 From: wolf Date: Mon, 7 Sep 1998 23:09:43 +0000 Subject: [PATCH] Move the smart pointer to the finite element into the right place, i.e. the base class. git-svn-id: https://svn.dealii.org/trunk@584 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/fe/fe_values.h | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/deal.II/deal.II/include/fe/fe_values.h b/deal.II/deal.II/include/fe/fe_values.h index cf56af6e8c..6f319388d3 100644 --- a/deal.II/deal.II/include/fe/fe_values.h +++ b/deal.II/deal.II/include/fe/fe_values.h @@ -223,7 +223,8 @@ class FEValuesBase { const unsigned int n_dofs, const unsigned int n_transform_functions, const unsigned int n_values_array, - const UpdateFlags update_flags); + const UpdateFlags update_flags, + const FiniteElement &fe); /** @@ -551,6 +552,11 @@ class FEValuesBase { * safer. */ DoFHandler::cell_iterator present_cell; + + /** + * Store the finite element for later use. + */ + SmartPointer > fe; }; @@ -621,10 +627,6 @@ class FEValues : public FEValuesBase { const Boundary &); private: - /** - * Store the finite element for later use. - */ - SmartPointer > fe; /** * Store the gradients of the shape * functions at the quadrature points on @@ -749,7 +751,8 @@ class FEFaceValuesBase : public FEValuesBase { const unsigned int n_dofs, const unsigned int n_transform_functions, const unsigned int n_faces_or_subfaces, - const UpdateFlags update_flags); + const UpdateFlags update_flags, + const FiniteElement &fe); /** * Return the outward normal vector to @@ -894,11 +897,6 @@ class FEFaceValues : public FEFaceValuesBase { void reinit (const typename DoFHandler::cell_iterator &cell, const unsigned int face_no, const Boundary &boundary); -private: - /** - * Store the finite element for later use. - */ - SmartPointer > fe; }; @@ -1055,11 +1053,6 @@ class FESubfaceValues : public FEFaceValuesBase { * Exception */ DeclException0 (ExcReinitCalledWithBoundaryFace); -private: - /** - * Store the finite element for later use. - */ - SmartPointer > fe; }; -- 2.39.5