From: Daniel Arndt Date: Thu, 12 Oct 2017 21:04:43 +0000 (+0200) Subject: Clarify FE_Enriched::setup_data X-Git-Tag: v9.0.0-rc1~955^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2876ca73c59eea0e74b6a3d609a66df31ca3a76;p=dealii.git Clarify FE_Enriched::setup_data --- diff --git a/include/deal.II/fe/fe_enriched.h b/include/deal.II/fe/fe_enriched.h index beca90acdd..c97f5edc5d 100644 --- a/include/deal.II/fe/fe_enriched.h +++ b/include/deal.II/fe/fe_enriched.h @@ -547,7 +547,7 @@ protected: */ template typename FiniteElement::InternalDataBase * - setup_data (std::unique_ptr::InternalDataBase> fes_data, + setup_data (std::unique_ptr::InternalDataBase> &&fes_data, const UpdateFlags flags, const Quadrature &quadrature) const; diff --git a/source/fe/fe_enriched.cc b/source/fe/fe_enriched.cc index 4463d3c4b2..10aecc077b 100644 --- a/source/fe/fe_enriched.cc +++ b/source/fe/fe_enriched.cc @@ -289,18 +289,17 @@ FE_Enriched::requires_update_flags (const UpdateFlags flags) const template template typename FiniteElement::InternalDataBase * -FE_Enriched::setup_data (std::unique_ptr::InternalDataBase> fes_data, +FE_Enriched::setup_data (std::unique_ptr::InternalDataBase> &&fes_data, const UpdateFlags flags, const Quadrature &quadrature) const { Assert ((dynamic_cast::InternalData *> (fes_data.get()) != nullptr), ExcInternalError()); - typename FESystem::InternalData *data_fesystem = - static_cast::InternalData *> (fes_data.get()); // FESystem::InternalData will be aggregated (owned) by // our InternalData. - fes_data.release(); + typename FESystem::InternalData *data_fesystem = + static_cast::InternalData *> (fes_data.release()); InternalData *data = new InternalData(std::unique_ptr::InternalData>(data_fesystem)); // copy update_each from FESystem data: