Fix occurrences of std_cxx11.

diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h
index 78d415db3bb99f9af02500c6750a42ef2aff4068..8464c04d2a8028525b31cc31802cf1200b3d0b60 100644 (file)
--- a/include/deal.II/grid/grid_tools.h
+++ b/include/deal.II/grid/grid_tools.h
@@ -748,9 +748,9 @@ namespace GridTools
   template <class MeshType>
   std::vector<typename MeshType::cell_iterator>
   compute_cell_halo_layer_on_level
-  (const MeshType                                                             &mesh,
-   const std_cxx11::function<bool (const typename MeshType::cell_iterator &)> &predicate,
-   const unsigned int                                                         level);
+  (const MeshType                                                       &mesh,
+   const std::function<bool (const typename MeshType::cell_iterator &)> &predicate,
+   const unsigned int                                                    level);
 
 
   /**

diff --git a/source/distributed/shared_tria.cc b/source/distributed/shared_tria.cc
index 6d75eda0a1efcbab1b89eef4f7b3b68a60ff66e2..190c0204f2a8e267164fc2f11089e52ab6fa5f0f 100644 (file)
--- a/source/distributed/shared_tria.cc
+++ b/source/distributed/shared_tria.cc
@@ -111,7 +111,7 @@ namespace parallel
           // loop over all cells in multigrid hierarchy and mark artificial:
           if (settings & construct_multigrid_hierarchy)
             {
-              std_cxx11::function<bool (const typename parallel::shared::Triangulation<dim,spacedim>::cell_iterator &)> predicate
+              std::function<bool (const typename parallel::shared::Triangulation<dim,spacedim>::cell_iterator &)> predicate
                 = IteratorFilters::LocallyOwnedLevelCell();
               for (unsigned int lvl=0; lvl<this->n_levels(); ++lvl)
                 {

diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc
index f584877d44aa85e1122bda8f040e35ed2cef407c..a24ff402e0327e2da23588cc13768ec4fbda0604 100644 (file)
--- a/source/grid/grid_tools.cc
+++ b/source/grid/grid_tools.cc
@@ -1619,9 +1619,9 @@ next_cell:
   template <class MeshType>
   std::vector<typename MeshType::cell_iterator>
   compute_cell_halo_layer_on_level
-  (const MeshType                                                             &mesh,
-   const std_cxx11::function<bool (const typename MeshType::cell_iterator &)> &predicate,
-   const unsigned int                                                         level)
+  (const MeshType                                                       &mesh,
+   const std::function<bool (const typename MeshType::cell_iterator &)> &predicate,
+   const unsigned int                                                    level)
   {
     std::vector<typename MeshType::cell_iterator> level_halo_layer;
     std::vector<bool> locally_active_vertices_on_level_subdomain (mesh.get_triangulation().n_vertices(),

diff --git a/source/grid/grid_tools.inst.in b/source/grid/grid_tools.inst.in
index 26396ca9e2f05fd15e1159e3a4be5d9ef6ac9ff1..3a96143c5f0d352e403c7313694317da05f04ca3 100644 (file)
--- a/source/grid/grid_tools.inst.in
+++ b/source/grid/grid_tools.inst.in
@@ -48,7 +48,7 @@ for (X : TRIANGULATION_AND_DOFHANDLERS; deal_II_dimension : DIMENSIONS ; deal_II
     template
     std::vector<X::cell_iterator>
     compute_cell_halo_layer_on_level (const X &,
-                                      const std_cxx11::function<bool (const X::cell_iterator&)> &,
+                                      const std::function<bool (const X::cell_iterator&)> &,
                                       const unsigned int);
 
     template