From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Thu, 11 Apr 2019 12:54:15 +0000 (+0200)
Subject: Replace std::make_unique by std_cxx14::make_unique
X-Git-Tag: v9.1.0-rc1~209^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7910%2Fhead;p=dealii.git

Replace std::make_unique by std_cxx14::make_unique
---

diff --git a/source/meshworker/scratch_data.cc b/source/meshworker/scratch_data.cc
index 8e6e8708c8..c55c72e77e 100644
--- a/source/meshworker/scratch_data.cc
+++ b/source/meshworker/scratch_data.cc
@@ -128,10 +128,8 @@ namespace MeshWorker
     const typename DoFHandler<dim, spacedim>::active_cell_iterator &cell)
   {
     if (!fe_values)
-      fe_values = std::make_unique<FEValues<dim, spacedim>>(*mapping,
-                                                            *fe,
-                                                            cell_quadrature,
-                                                            cell_update_flags);
+      fe_values = std_cxx14::make_unique<FEValues<dim, spacedim>>(
+        *mapping, *fe, cell_quadrature, cell_update_flags);
 
     fe_values->reinit(cell);
     cell->get_dof_indices(local_dof_indices);
@@ -148,7 +146,7 @@ namespace MeshWorker
     const unsigned int                                              face_no)
   {
     if (!fe_face_values)
-      fe_face_values = std::make_unique<FEFaceValues<dim, spacedim>>(
+      fe_face_values = std_cxx14::make_unique<FEFaceValues<dim, spacedim>>(
         *mapping, *fe, face_quadrature, face_update_flags);
 
     fe_face_values->reinit(cell, face_no);
@@ -169,8 +167,9 @@ namespace MeshWorker
     if (subface_no != numbers::invalid_unsigned_int)
       {
         if (!fe_subface_values)
-          fe_subface_values = std::make_unique<FESubfaceValues<dim, spacedim>>(
-            *mapping, *fe, face_quadrature, face_update_flags);
+          fe_subface_values =
+            std_cxx14::make_unique<FESubfaceValues<dim, spacedim>>(
+              *mapping, *fe, face_quadrature, face_update_flags);
         fe_subface_values->reinit(cell, face_no, subface_no);
         cell->get_dof_indices(local_dof_indices);
 
@@ -189,7 +188,7 @@ namespace MeshWorker
     const typename DoFHandler<dim, spacedim>::active_cell_iterator &cell)
   {
     if (!neighbor_fe_values)
-      neighbor_fe_values = std::make_unique<FEValues<dim, spacedim>>(
+      neighbor_fe_values = std_cxx14::make_unique<FEValues<dim, spacedim>>(
         *mapping, *fe, cell_quadrature, neighbor_cell_update_flags);
 
     neighbor_fe_values->reinit(cell);
@@ -207,8 +206,9 @@ namespace MeshWorker
     const unsigned int                                              face_no)
   {
     if (!neighbor_fe_face_values)
-      neighbor_fe_face_values = std::make_unique<FEFaceValues<dim, spacedim>>(
-        *mapping, *fe, face_quadrature, neighbor_face_update_flags);
+      neighbor_fe_face_values =
+        std_cxx14::make_unique<FEFaceValues<dim, spacedim>>(
+          *mapping, *fe, face_quadrature, neighbor_face_update_flags);
     neighbor_fe_face_values->reinit(cell, face_no);
     cell->get_dof_indices(neighbor_dof_indices);
     current_neighbor_fe_values = neighbor_fe_face_values.get();
@@ -228,7 +228,7 @@ namespace MeshWorker
       {
         if (!neighbor_fe_subface_values)
           neighbor_fe_subface_values =
-            std::make_unique<FESubfaceValues<dim, spacedim>>(
+            std_cxx14::make_unique<FESubfaceValues<dim, spacedim>>(
               *mapping, *fe, face_quadrature, neighbor_face_update_flags);
         neighbor_fe_subface_values->reinit(cell, face_no, subface_no);
         cell->get_dof_indices(neighbor_dof_indices);
@@ -353,4 +353,4 @@ namespace MeshWorker
 {
 #include "scratch_data.inst"
 }
-DEAL_II_NAMESPACE_CLOSE
\ No newline at end of file
+DEAL_II_NAMESPACE_CLOSE