]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Clarify FE_Enriched::setup_data
authorDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Thu, 12 Oct 2017 21:04:43 +0000 (23:04 +0200)
committerDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Thu, 12 Oct 2017 21:13:02 +0000 (23:13 +0200)
include/deal.II/fe/fe_enriched.h
source/fe/fe_enriched.cc

index beca90acdd5b54949bfcb2203339e4dfe5a20634..c97f5edc5de12b97ed102ff5a38a8c0e5089b68b 100644 (file)
@@ -547,7 +547,7 @@ protected:
    */
   template <int dim_1>
   typename FiniteElement<dim,spacedim>::InternalDataBase *
-  setup_data (std::unique_ptr<typename FiniteElement<dim,spacedim>::InternalDataBase> fes_data,
+  setup_data (std::unique_ptr<typename FiniteElement<dim,spacedim>::InternalDataBase> &&fes_data,
               const UpdateFlags      flags,
               const Quadrature<dim_1> &quadrature) const;
 
index 4463d3c4b267209b54bc4c23dde1a49f97b7a03f..10aecc077b9764f00917b9068afca2f25d8fb355 100644 (file)
@@ -289,18 +289,17 @@ FE_Enriched<dim,spacedim>::requires_update_flags (const UpdateFlags flags) const
 template <int dim, int spacedim>
 template <int dim_1>
 typename FiniteElement<dim,spacedim>::InternalDataBase *
-FE_Enriched<dim,spacedim>::setup_data (std::unique_ptr<typename FiniteElement<dim,spacedim>::InternalDataBase> fes_data,
+FE_Enriched<dim,spacedim>::setup_data (std::unique_ptr<typename FiniteElement<dim,spacedim>::InternalDataBase> &&fes_data,
                                        const UpdateFlags      flags,
                                        const Quadrature<dim_1> &quadrature) const
 {
   Assert ((dynamic_cast<typename FESystem<dim,spacedim>::InternalData *> (fes_data.get()) != nullptr),
           ExcInternalError());
-  typename FESystem<dim,spacedim>::InternalData *data_fesystem =
-    static_cast<typename FESystem<dim,spacedim>::InternalData *> (fes_data.get());
 
   // FESystem::InternalData will be aggregated (owned) by
   // our InternalData.
-  fes_data.release();
+  typename FESystem<dim,spacedim>::InternalData *data_fesystem =
+    static_cast<typename FESystem<dim,spacedim>::InternalData *> (fes_data.release());
   InternalData *data = new InternalData(std::unique_ptr<typename FESystem<dim,spacedim>::InternalData>(data_fesystem));
 
   // copy update_each from FESystem data:

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.