From dd3d84af7a39015046e7d5e4327a9ece1ae5b58f Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Thu, 6 Apr 2017 07:23:49 -0600 Subject: [PATCH] Fix occurrences of std_cxx11. --- include/deal.II/grid/grid_tools.h | 6 +++--- source/distributed/shared_tria.cc | 2 +- source/grid/grid_tools.cc | 6 +++--- source/grid/grid_tools.inst.in | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h index 78d415db3b..8464c04d2a 100644 --- a/include/deal.II/grid/grid_tools.h +++ b/include/deal.II/grid/grid_tools.h @@ -748,9 +748,9 @@ namespace GridTools template std::vector compute_cell_halo_layer_on_level - (const MeshType &mesh, - const std_cxx11::function &predicate, - const unsigned int level); + (const MeshType &mesh, + const std::function &predicate, + const unsigned int level); /** diff --git a/source/distributed/shared_tria.cc b/source/distributed/shared_tria.cc index 6d75eda0a1..190c0204f2 100644 --- 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::cell_iterator &)> predicate + std::function::cell_iterator &)> predicate = IteratorFilters::LocallyOwnedLevelCell(); for (unsigned int lvl=0; lvln_levels(); ++lvl) { diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc index f584877d44..a24ff402e0 100644 --- a/source/grid/grid_tools.cc +++ b/source/grid/grid_tools.cc @@ -1619,9 +1619,9 @@ next_cell: template std::vector compute_cell_halo_layer_on_level - (const MeshType &mesh, - const std_cxx11::function &predicate, - const unsigned int level) + (const MeshType &mesh, + const std::function &predicate, + const unsigned int level) { std::vector level_halo_layer; std::vector 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 26396ca9e2..3a96143c5f 100644 --- 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 compute_cell_halo_layer_on_level (const X &, - const std_cxx11::function &, + const std::function &, const unsigned int); template -- 2.39.5