From: Wolfgang Bangerth Date: Tue, 18 Apr 2017 02:51:27 +0000 (-0600) Subject: Use std::unique_ptr instead of std::shared_ptr in FESystem. X-Git-Tag: v9.0.0-rc1~1670^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F4277%2Fhead;p=dealii.git Use std::unique_ptr instead of std::shared_ptr in FESystem. --- diff --git a/include/deal.II/fe/fe_system.h b/include/deal.II/fe/fe_system.h index 73029e2c91..c8a3e6b9fa 100644 --- a/include/deal.II/fe/fe_system.h +++ b/include/deal.II/fe/fe_system.h @@ -24,8 +24,10 @@ #include #include #include +#include #include + DEAL_II_NAMESPACE_OPEN template class FE_Enriched; @@ -968,7 +970,7 @@ private: * pointers to the underlying base finite elements. The last one of these * copies around will then delete the pointer to the base elements. */ - std::vector >, + std::vector >, unsigned int> > base_elements; diff --git a/source/fe/fe_system.cc b/source/fe/fe_system.cc index 195af9f593..db57a865e5 100644 --- a/source/fe/fe_system.cc +++ b/source/fe/fe_system.cc @@ -1478,7 +1478,7 @@ void FESystem::initialize (const std::vector>(fes[i]->clone()), + = std::make_pair (std::unique_ptr>(fes[i]->clone()), multiplicities[i]); }); ++ind;