Fix a couple C++11 usages.

git-svn-id: https://svn.dealii.org/trunk@30645 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/source/grid/grid_tools.cc b/deal.II/source/grid/grid_tools.cc
index 4dfd9ec1192b6937b85237c61763760b12b4b8ed..1192d8c0ff2f7793e0bb9ca845182f308941a152 100644 (file)
--- a/deal.II/source/grid/grid_tools.cc
+++ b/deal.II/source/grid/grid_tools.cc
@@ -2602,10 +2602,10 @@ next_cell:
                 const std_cxx1x::tuple<typename DH::cell_iterator, unsigned int,
                                        typename DH::cell_iterator, unsigned int>
                   periodic_tuple
-                    = std::make_tuple(p->first.first,
-                                      p->first.second,
-                                      cell,
-                                      f);
+                    = std_cxx1x::make_tuple(p->first.first,
+                                           p->first.second,
+                                           cell,
+                                           f);
 
                 periodicity_vector.push_back(periodic_tuple);
 

diff --git a/deal.II/source/grid/grid_tools.inst.in b/deal.II/source/grid/grid_tools.inst.in
index 9b3bc3b7f64bc44bd38a0d14873f1bb7ad94c016..fdaecb93c5f189abf133c1bd1cd79d5d79153aed 100644 (file)
--- a/deal.II/source/grid/grid_tools.inst.in
+++ b/deal.II/source/grid/grid_tools.inst.in
@@ -278,8 +278,8 @@ for (X : TRIANGULATION_AND_DOFHANDLERS; deal_II_dimension : DIMENSIONS ; deal_II
          const types::boundary_id,
          const types::boundary_id,
          const unsigned int,
-         std::vector<std_cxx1x::tuple<typename X::cell_iterator, unsigned int,
-                                      typename X::cell_iterator, unsigned int> > &);
+         std::vector<std_cxx1x::tuple<X::cell_iterator, unsigned int,
+                                      X::cell_iterator, unsigned int> > &);
 
     #endif
 
@@ -299,9 +299,9 @@ for (deal_II_dimension : DIMENSIONS ; deal_II_space_dimension : SPACE_DIMENSIONS
           const types::boundary_id,
           const types::boundary_id,
           const unsigned int,
-          std::vector<std_cxx1x::tuple<typename parallel::distributed::Triangulation<deal_II_dimension, deal_II_space_dimension>::cell_iterator,
+          std::vector<std_cxx1x::tuple<parallel::distributed::Triangulation<deal_II_dimension, deal_II_space_dimension>::cell_iterator,
                                        unsigned int,
-                                       typename parallel::distributed::Triangulation<deal_II_dimension, deal_II_space_dimension>::cell_iterator, 
+                                       parallel::distributed::Triangulation<deal_II_dimension, deal_II_space_dimension>::cell_iterator, 
                                        unsigned int> > &);
      \}
    #endif