Merge pull request #4128 from Rombur/std_cxx11

Replace std_cxx11 and std_cxx1x functions by std ones

diff --cc include/deal.II/distributed/shared_tria.h
Simple merge

diff --cc include/deal.II/grid/grid_tools.h
index e7b931f055626edf0264da55f4a129be1141f188,9e1e558abc3d96250fb11aa16b1ff006274da96e..78d415db3bb99f9af02500c6750a42ef2aff4068
--- 1/include/deal.II/grid/grid_tools.h
--- 2/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 include/deal.II/grid/tria.h
Simple merge

diff --cc include/deal.II/matrix_free/fe_evaluation.h
Simple merge

diff --cc include/deal.II/matrix_free/matrix_free.h
Simple merge

diff --cc include/deal.II/numerics/vector_tools.templates.h
Simple merge

diff --cc source/distributed/shared_tria.cc
index ad46f85113be0fa4262480e175a4cc4f66997f73,50fc14f7d413aa8b01de8abbd2804a759a297f44..6d75eda0a1efcbab1b89eef4f7b3b68a60ff66e2
--- 1/source/distributed/shared_tria.cc
--- 2/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/fe/fe_system.cc
Simple merge

diff --cc source/grid/grid_tools.cc
Simple merge

diff --cc source/grid/grid_tools.inst.in
index f494b2c60ef3d2ad50b4561a22ee097105bc9684,7aa1b9eccac35adb1b52a96e846471b73edb1a6d..26396ca9e2f05fd15e1159e3a4be5d9ef6ac9ff1
--- 1/source/grid/grid_tools.inst.in
--- 2/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 &);

diff --cc source/grid/tria.cc
Simple merge

diff --cc source/numerics/point_value_history.cc
Simple merge

diff --cc tests/matrix_free/matrix_vector_20.cc
Simple merge

diff --cc tests/matrix_free/matrix_vector_21.cc
Simple merge

diff --cc tests/matrix_free/matrix_vector_stokes_base.cc
Simple merge