From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Thu, 6 Apr 2017 13:09:05 +0000 (-0600)
Subject: Merge pull request #4128 from Rombur/std_cxx11
X-Git-Tag: v9.0.0-rc1~1736
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c2c419a6ba1265b5696369d333558820eda24bc;p=dealii.git

Merge pull request #4128 from Rombur/std_cxx11

Replace std_cxx11 and std_cxx1x functions by std ones
---

1c2c419a6ba1265b5696369d333558820eda24bc
diff --cc include/deal.II/grid/grid_tools.h
index e7b931f055,9e1e558abc..78d415db3b
--- a/include/deal.II/grid/grid_tools.h
+++ b/include/deal.II/grid/grid_tools.h
@@@ -735,24 -735,8 +735,24 @@@ namespace GridTool
    std::vector<typename MeshType::active_cell_iterator>
    compute_active_cell_halo_layer
    (const MeshType                                                                    &mesh,
-    const std_cxx11::function<bool (const typename MeshType::active_cell_iterator &)> &predicate);
+    const std::function<bool (const typename MeshType::active_cell_iterator &)> &predicate);
  
 +
 +  /**
 +   * Extract and return the cell layer around a subdomain (set of
 +   * cells) on a specified level of the @p mesh (i.e. those cells on
 +   * that level that share a common set of vertices with the subdomain
 +   * but are not a part of it). Here, the "subdomain" consists of exactly
 +   * all of those cells for which the @p predicate returns @p true.
 +   */
 +  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);
 +
 +
    /**
     * Extract and return ghost cells which are the active cell layer around all
     * locally owned cells. This is most relevant for
diff --cc source/distributed/shared_tria.cc
index ad46f85113,50fc14f7d4..6d75eda0a1
--- a/source/distributed/shared_tria.cc
+++ b/source/distributed/shared_tria.cc
@@@ -88,9 -57,9 +88,9 @@@ namespace paralle
  
        if (allow_artificial_cells)
          {
 -          // get halo layer of (ghost) cells
 +          // get active halo layer of (ghost) cells
            // parallel::shared::Triangulation<dim>::
-           std_cxx11::function<bool (const typename parallel::shared::Triangulation<dim,spacedim>::active_cell_iterator &)> predicate
+           std::function<bool (const typename parallel::shared::Triangulation<dim,spacedim>::active_cell_iterator &)> predicate
              = IteratorFilters::SubdomainEqualTo(this->my_subdomain);
  
            const std::vector<typename parallel::shared::Triangulation<dim,spacedim>::active_cell_iterator>
diff --cc source/grid/grid_tools.inst.in
index f494b2c60e,7aa1b9ecca..26396ca9e2
--- a/source/grid/grid_tools.inst.in
+++ b/source/grid/grid_tools.inst.in
@@@ -43,14 -43,8 +43,14 @@@ for (X : TRIANGULATION_AND_DOFHANDLERS
      template
      std::vector<dealii::internal::ActiveCellIterator<deal_II_dimension, deal_II_space_dimension, X>::type>
      compute_active_cell_halo_layer (const X &,
-                                     const std_cxx11::function<bool (const dealii::internal::ActiveCellIterator<deal_II_dimension, deal_II_space_dimension, X>::type&)> &);
+                                     const std::function<bool (const dealii::internal::ActiveCellIterator<deal_II_dimension, deal_II_space_dimension, X>::type&)> &);
  
 +    template
 +    std::vector<X::cell_iterator>
 +    compute_cell_halo_layer_on_level (const X &,
 +                                      const std_cxx11::function<bool (const X::cell_iterator&)> &,
 +                                      const unsigned int);
 +
      template
      std::vector<dealii::internal::ActiveCellIterator<deal_II_dimension, deal_II_space_dimension, X>::type>
      compute_ghost_cell_halo_layer (const X &);