Replace all occurrences of std_cxx1x by std_cxx11 also in tests/.

diff --git a/tests/all-headers/CMakeLists.txt b/tests/all-headers/CMakeLists.txt
index dcf4cde8b7b4c5b4390ba0d45c7714de68932ccd..fd8c9995ba627aaa17dea720140f440b6be9e189 100644 (file)
--- a/tests/all-headers/CMakeLists.txt
+++ b/tests/all-headers/CMakeLists.txt
@@ -37,8 +37,8 @@ FOREACH(_full_file ${_header})
   # TODO: A more sophisticated way to get the relative include path:
   GET_FILENAME_COMPONENT(_path ${_full_file} PATH)
   GET_FILENAME_COMPONENT(_path ${_path} NAME)
-  IF("${_path}" STREQUAL "std_cxx1x")
-    SET(_path "base/std_cxx1x")
+  IF("${_path}" STREQUAL "std_cxx11")
+    SET(_path "base/std_cxx11")
   ENDIF()
 
   FOREACH(_build ${DEAL_II_BUILD_TYPES})

diff --git a/tests/base/data_out_base.cc b/tests/base/data_out_base.cc
index 4265f40dc5fe848976a6a958ef5e4ed714aba0d3..f476115036b2569d47ae167e1956627e6afdb2cc 100644 (file)
--- a/tests/base/data_out_base.cc
+++ b/tests/base/data_out_base.cc
@@ -48,7 +48,7 @@ write_patches(const std::vector<DataOutBase::Patch<dim,spacedim> > &patches,
   DataOutBase::VtkFlags vtkflags;
   DataOutBase::Deal_II_IntermediateFlags deal_II_intermediateflags;
 
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
 
   WRITE(dx);
   if (dim==2)

diff --git a/tests/base/data_out_base_dx.cc b/tests/base/data_out_base_dx.cc
index 14c0e7a478ce0c5fdeedfe61442bf9aadbddf92d..652a927c7fceea71bb810fdab9f1c7b2fed3096a 100644 (file)
--- a/tests/base/data_out_base_dx.cc
+++ b/tests/base/data_out_base_dx.cc
@@ -51,7 +51,7 @@ void check(DataOutBase::DXFlags flags,
   names[3] = "x4";
   names[4] = "i";
 
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
 
   DataOutBase::write_dx(patches, names, vectors, flags, out);
 }
@@ -69,7 +69,7 @@ void check_cont(unsigned int ncells,
 
   std::vector<std::string> names(1);
   names[0] = "CutOff";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_dx(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/base/data_out_base_eps.cc b/tests/base/data_out_base_eps.cc
index 87481909dde36775a3136a20632f8817b1bd85fd..2c591344f306b8c8cff992f84859e3983a790ced 100644 (file)
--- a/tests/base/data_out_base_eps.cc
+++ b/tests/base/data_out_base_eps.cc
@@ -50,7 +50,7 @@ void check(DataOutBase::EpsFlags flags,
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_eps(patches, names, vectors, flags, out);
 }
 
@@ -67,7 +67,7 @@ void check_cont(unsigned int ncells,
 
   std::vector<std::string> names(1);
   names[0] = "CutOff";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_eps(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/base/data_out_base_gmv.cc b/tests/base/data_out_base_gmv.cc
index ae6d194696855068d63c7a6f4db6b8d2dd4d7efc..0f07a37b54c14fcaf870d8e17645cd8befc8a216 100644 (file)
--- a/tests/base/data_out_base_gmv.cc
+++ b/tests/base/data_out_base_gmv.cc
@@ -49,7 +49,7 @@ void check(DataOutBase::GmvFlags flags,
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_gmv(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/base/data_out_base_gnuplot.cc b/tests/base/data_out_base_gnuplot.cc
index 19ebf4ba2a5b706748488d37a9d0319affbe1048..ec841f192761957923257adc54b0eacbf45d017e 100644 (file)
--- a/tests/base/data_out_base_gnuplot.cc
+++ b/tests/base/data_out_base_gnuplot.cc
@@ -48,7 +48,7 @@ void check(DataOutBase::GnuplotFlags flags,
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_gnuplot(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/base/data_out_base_povray.cc b/tests/base/data_out_base_povray.cc
index 011136775e08d3a0471a55f31c559b2eead53e26..71a8533e865fdcf7e243d5559384d6760341c708 100644 (file)
--- a/tests/base/data_out_base_povray.cc
+++ b/tests/base/data_out_base_povray.cc
@@ -50,7 +50,7 @@ void check(DataOutBase::PovrayFlags flags,
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_povray(patches, names, vectors, flags, out);
 }
 
@@ -67,7 +67,7 @@ void check_cont(unsigned int ncells,
 
   std::vector<std::string> names(1);
   names[0] = "CutOff";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_povray(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/base/data_out_base_tecplot.cc b/tests/base/data_out_base_tecplot.cc
index fa94479dd15061436481a31f8012110cd60daca2..76c3539ab61538108f6a7299d075235b14870176 100644 (file)
--- a/tests/base/data_out_base_tecplot.cc
+++ b/tests/base/data_out_base_tecplot.cc
@@ -49,7 +49,7 @@ void check(DataOutBase::TecplotFlags flags,
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_tecplot(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/base/data_out_base_tecplot_bin.cc b/tests/base/data_out_base_tecplot_bin.cc
index f5136524bd69bb096b966e9e7e830d5704384482..5360ab28dc76b222f59427b0b026f8315305f28a 100644 (file)
--- a/tests/base/data_out_base_tecplot_bin.cc
+++ b/tests/base/data_out_base_tecplot_bin.cc
@@ -46,7 +46,7 @@ void check(DataOutBase::TecplotFlags flags,
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_tecplot_binary(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/base/data_out_base_vtk.cc b/tests/base/data_out_base_vtk.cc
index 1122e461f8715e91c8608120bb09865b2ed665d3..3fac84070b169770261f0dd5d77a4b02b6068865 100644 (file)
--- a/tests/base/data_out_base_vtk.cc
+++ b/tests/base/data_out_base_vtk.cc
@@ -49,7 +49,7 @@ void check(DataOutBase::VtkFlags flags,
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_vtk(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/base/data_out_base_vtk_cycle.cc b/tests/base/data_out_base_vtk_cycle.cc
index 9c2a2648c0c89d2317188da657abb2536b91b173..2f81d3fdad81e4f291932edc3e0ce946bd3a11ad 100644 (file)
--- a/tests/base/data_out_base_vtk_cycle.cc
+++ b/tests/base/data_out_base_vtk_cycle.cc
@@ -52,7 +52,7 @@ void check(DataOutBase::VtkFlags flags,
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_vtk(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/base/data_out_base_vtk_time.cc b/tests/base/data_out_base_vtk_time.cc
index 478a06a688c834c56aa3f14f5dfb54c774b37c4b..3c01d51c1484029fc6a22a58133deea1298b171f 100644 (file)
--- a/tests/base/data_out_base_vtk_time.cc
+++ b/tests/base/data_out_base_vtk_time.cc
@@ -52,7 +52,7 @@ void check(DataOutBase::VtkFlags flags,
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_vtk(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/base/data_out_base_vtk_time_and_cycle.cc b/tests/base/data_out_base_vtk_time_and_cycle.cc
index c08dadc9cc0e10d20b5b5112cf6a7b72c71590f4..cd89ac4bbb8b79e6422b62a151c8f6c39a44ee06 100644 (file)
--- a/tests/base/data_out_base_vtk_time_and_cycle.cc
+++ b/tests/base/data_out_base_vtk_time_and_cycle.cc
@@ -52,7 +52,7 @@ void check(DataOutBase::VtkFlags flags,
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_vtk(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/base/data_out_base_vtu.cc b/tests/base/data_out_base_vtu.cc
index a5d3a2834b0a75cd0df8b03ee111a83a7e73a2bf..234a7f04727112d50772353b729f3c73186f4764 100644 (file)
--- a/tests/base/data_out_base_vtu.cc
+++ b/tests/base/data_out_base_vtu.cc
@@ -49,7 +49,7 @@ void check(DataOutBase::VtkFlags flags,
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_vtu(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/base/data_out_base_vtu_cycle.cc b/tests/base/data_out_base_vtu_cycle.cc
index 2cafd1530ddf04edba117f0c1f099095cc9a198d..00bd315fba118cb7f0ce7261c4636f285f085858 100644 (file)
--- a/tests/base/data_out_base_vtu_cycle.cc
+++ b/tests/base/data_out_base_vtu_cycle.cc
@@ -51,7 +51,7 @@ void check(DataOutBase::VtkFlags flags,
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_vtu(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/base/data_out_base_vtu_time.cc b/tests/base/data_out_base_vtu_time.cc
index 1b1e41a1fcb6bdf77c0d3fe7256e7d3765ce9221..4895899413071e413dc8637701cc9816a63e648f 100644 (file)
--- a/tests/base/data_out_base_vtu_time.cc
+++ b/tests/base/data_out_base_vtu_time.cc
@@ -51,7 +51,7 @@ void check(DataOutBase::VtkFlags flags,
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_vtu(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/base/data_out_base_vtu_time_and_cycle.cc b/tests/base/data_out_base_vtu_time_and_cycle.cc
index 6c864b7d37f3f6e918d40ed5601d47cb14d9927f..4b7e9f78001337b5bd4de68af77f4537de704b29 100644 (file)
--- a/tests/base/data_out_base_vtu_time_and_cycle.cc
+++ b/tests/base/data_out_base_vtu_time_and_cycle.cc
@@ -52,7 +52,7 @@ void check(DataOutBase::VtkFlags flags,
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_vtu(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/base/data_out_reader_01.cc b/tests/base/data_out_reader_01.cc
index 95d9d335c2b33a1b283f7b65b6f079db556bbee2..99a099506624d730ebd65e2e3bc453329e5bbc0e 100644 (file)
--- a/tests/base/data_out_reader_01.cc
+++ b/tests/base/data_out_reader_01.cc
@@ -43,7 +43,7 @@ void check()
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
 
   std::ostringstream old_data;
   DataOutBase::write_deal_II_intermediate(patches, names, vectors,

diff --git a/tests/base/function_parser_04.cc b/tests/base/function_parser_04.cc
index 461522a561291a387e9352d6388c2f70026a9843..869e2376884983856f19768a518d44b16995bd5a 100644 (file)
--- a/tests/base/function_parser_04.cc
+++ b/tests/base/function_parser_04.cc
@@ -78,9 +78,9 @@ void test2()
   WorkStream::run(v.begin(),
                   v.end(),
                   &assemble,
-                  std_cxx1x::bind(&copy,
-                                  std_cxx1x::ref(result),
-                                  std_cxx1x::_1),
+                  std_cxx11::bind(&copy,
+                                  std_cxx11::ref(result),
+                                  std_cxx11::_1),
                   scratch_data(), copy_data());
   std::cout << "result: " << result << std::endl;
 

diff --git a/tests/base/functions_04.cc b/tests/base/functions_04.cc
index 3524d65d39336956fe1a0012dcfb60e30071ddcc..d9c6fad08f93663cbd742dfec7a45f3de5dd9351 100644 (file)
--- a/tests/base/functions_04.cc
+++ b/tests/base/functions_04.cc
@@ -185,7 +185,7 @@ check_function(const Functions::FlowFunction<dim> &f,
   
   DataOutBase::DXFlags dxflags;
   DataOutBase::GnuplotFlags gflags;
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   if (dim==2)
     DataOutBase::write_gnuplot(patches, names, vectors, gflags, out);
   else

diff --git a/tests/base/functions_05.cc b/tests/base/functions_05.cc
index c5bf09d967b650cf0a225f2a36c9d452e58aeadc..ca1b4a4fadabea86da9450f41f87e2d816debc7f 100644 (file)
--- a/tests/base/functions_05.cc
+++ b/tests/base/functions_05.cc
@@ -49,9 +49,9 @@ void check2 ()
     q[d] = d;
 
   ScalarFunctionFromFunctionObject<dim>
-  object (std_cxx1x::bind (&Point<dim>::distance,
+  object (std_cxx11::bind (&Point<dim>::distance,
                            q,
-                           std_cxx1x::_1));
+                           std_cxx11::_1));
 
   for (unsigned int i=0; i<10; ++i)
     {

diff --git a/tests/base/functions_06.cc b/tests/base/functions_06.cc
index 5d228c7c86157db083f89f9c9dbe443d06d739d6..5c185e6f6982dee544aeb9a29db031ebd15f4eea 100644 (file)
--- a/tests/base/functions_06.cc
+++ b/tests/base/functions_06.cc
@@ -59,9 +59,9 @@ void check2 ()
     q[d] = d;
 
   ScalarFunctionFromFunctionObject<dim>
-  object (std_cxx1x::bind (&Point<dim>::distance,
+  object (std_cxx11::bind (&Point<dim>::distance,
                            q,
-                           std_cxx1x::_1));
+                           std_cxx11::_1));
 
   for (unsigned int i=0; i<10; ++i)
     {

diff --git a/tests/base/functions_10.cc b/tests/base/functions_10.cc
index 0f6714c0a5c48b2457dbacb3a909fa8982a8e172..4c2919bdec428ff6dad8a9429ff95e1b8f6b920c 100644 (file)
--- a/tests/base/functions_10.cc
+++ b/tests/base/functions_10.cc
@@ -23,7 +23,7 @@
 // now interpolate the function x*y*z onto points. note that this function is
 // (bi/tri)linear and so we can later know what the correct value is that the
 // function should provide
-Table<1,double> fill (const std_cxx1x::array<std::vector<double>,1> &coordinates)
+Table<1,double> fill (const std_cxx11::array<std::vector<double>,1> &coordinates)
 {
   Table<1,double> data(coordinates[0].size());
   for (unsigned int i=0; i<coordinates[0].size(); ++i)
@@ -31,7 +31,7 @@ Table<1,double> fill (const std_cxx1x::array<std::vector<double>,1> &coordinates
   return data;
 }
 
-Table<2,double> fill (const std_cxx1x::array<std::vector<double>,2> &coordinates)
+Table<2,double> fill (const std_cxx11::array<std::vector<double>,2> &coordinates)
 {
   Table<2,double> data(coordinates[0].size(),
                coordinates[1].size());
@@ -41,7 +41,7 @@ Table<2,double> fill (const std_cxx1x::array<std::vector<double>,2> &coordinates
   return data;
 }
 
-Table<3,double> fill (const std_cxx1x::array<std::vector<double>,3> &coordinates)
+Table<3,double> fill (const std_cxx11::array<std::vector<double>,3> &coordinates)
 {
   Table<3,double> data(coordinates[0].size(),
                coordinates[1].size(),
@@ -61,7 +61,7 @@ void check ()
 {
   // have coordinate arrays that span an interval starting at d+1
   // d+5 nonuniform intervals
-  std_cxx1x::array<std::vector<double>,dim> coordinates;
+  std_cxx11::array<std::vector<double>,dim> coordinates;
   for (unsigned int d=0; d<dim; ++d)
     for (unsigned int i=0; i<d+5; ++i)
       coordinates[d].push_back (d+1 + 1.*i*i);

diff --git a/tests/base/functions_11.cc b/tests/base/functions_11.cc
index 00dffb53016386b8633237cc5338e7e924646524..a41f09946569b4b4abe82ba6a836de7549635333 100644 (file)
--- a/tests/base/functions_11.cc
+++ b/tests/base/functions_11.cc
@@ -23,7 +23,7 @@
 // now interpolate the function x*y*z onto points. note that this function is
 // (bi/tri)linear and so we can later know what the correct value is that the
 // function should provide
-Table<1,double> fill (const std_cxx1x::array<std::vector<double>,1> &coordinates)
+Table<1,double> fill (const std_cxx11::array<std::vector<double>,1> &coordinates)
 {
   Table<1,double> data(coordinates[0].size());
   for (unsigned int i=0; i<coordinates[0].size(); ++i)
@@ -31,7 +31,7 @@ Table<1,double> fill (const std_cxx1x::array<std::vector<double>,1> &coordinates
   return data;
 }
 
-Table<2,double> fill (const std_cxx1x::array<std::vector<double>,2> &coordinates)
+Table<2,double> fill (const std_cxx11::array<std::vector<double>,2> &coordinates)
 {
   Table<2,double> data(coordinates[0].size(),
                coordinates[1].size());
@@ -41,7 +41,7 @@ Table<2,double> fill (const std_cxx1x::array<std::vector<double>,2> &coordinates
   return data;
 }
 
-Table<3,double> fill (const std_cxx1x::array<std::vector<double>,3> &coordinates)
+Table<3,double> fill (const std_cxx11::array<std::vector<double>,3> &coordinates)
 {
   Table<3,double> data(coordinates[0].size(),
                coordinates[1].size(),
@@ -61,15 +61,15 @@ void check ()
 {
   // have coordinate arrays that span an interval starting at d+1
   // d+5 nonuniform intervals
-  std_cxx1x::array<std::pair<double,double>,dim> intervals;
-  std_cxx1x::array<unsigned int,dim> n_subintervals;
+  std_cxx11::array<std::pair<double,double>,dim> intervals;
+  std_cxx11::array<unsigned int,dim> n_subintervals;
   for (unsigned int d=0; d<dim; ++d)
     {
       intervals[d] = std::make_pair(d+2., 2*d+5.);
       n_subintervals[d] = d+1 + d*d;
     }
 
-  std_cxx1x::array<std::vector<double>,dim> coordinates;
+  std_cxx11::array<std::vector<double>,dim> coordinates;
   for (unsigned int d=0; d<dim; ++d)
     {
       const double x = intervals[d].first;

diff --git a/tests/base/functions_singularity.cc b/tests/base/functions_singularity.cc
index 13b6ead1a23233db2053da4ff77e253df07fff46..0255c3eb67937d9b9b4e28641350605e19b350e6 100644 (file)
--- a/tests/base/functions_singularity.cc
+++ b/tests/base/functions_singularity.cc
@@ -225,7 +225,7 @@ check_function_derivative(const Functions::FlowFunction<dim> &f,
 
   DataOutBase::DXFlags dxflags;
   DataOutBase::GnuplotFlags gflags;
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> > vectors;
   if (dim==2)
     DataOutBase::write_gnuplot(patches, names, vectors, gflags, out);
   else

diff --git a/tests/base/graph_coloring_01.cc b/tests/base/graph_coloring_01.cc
index c5a49ae473113024581a7c8c9e3b7231c65f41ba..eb1de9ab6993d14d87a64ca57362a0436852aeca 100644 (file)
--- a/tests/base/graph_coloring_01.cc
+++ b/tests/base/graph_coloring_01.cc
@@ -58,7 +58,7 @@ void check()
   typename DoFHandler<dim>::active_cell_iterator cell(dof_handler.begin_active());
   std::vector<std::vector<typename DoFHandler<dim>::active_cell_iterator> > coloring(
       GraphColoring::make_graph_coloring(cell,dof_handler.end(),
-      std_cxx1x::function<std::vector<types::global_dof_index> (typename 
+      std_cxx11::function<std::vector<types::global_dof_index> (typename 
         DoFHandler<dim>::active_cell_iterator const &)> (&get_conflict_indices_cfem<dim>)));      
 
   // Output the coloring

diff --git a/tests/base/graph_coloring_02.cc b/tests/base/graph_coloring_02.cc
index aa0de967951fa7a2234ab6c2e8d184910825e478..c80cf118a35699d6f954da763c4eb2258a3d11bd 100644 (file)
--- a/tests/base/graph_coloring_02.cc
+++ b/tests/base/graph_coloring_02.cc
@@ -68,7 +68,7 @@ void check()
   // Create the coloring
   std::vector<std::vector<typename DoFHandler<dim>::active_cell_iterator> > coloring(
       GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(),
-        std_cxx1x::function<std::vector<types::global_dof_index> (typename 
+        std_cxx11::function<std::vector<types::global_dof_index> (typename 
           DoFHandler<dim>::active_cell_iterator const &)> (&get_conflict_indices_cfem<dim>)));
 
   // Output the coloring

diff --git a/tests/base/graph_coloring_02a.cc b/tests/base/graph_coloring_02a.cc
index 56a7549a30ffa728d21e0d0a03b68c79eaf20c8c..7d4268a3f5738f9ba4f8c09cc267fc3a66aa6c9c 100644 (file)
--- a/tests/base/graph_coloring_02a.cc
+++ b/tests/base/graph_coloring_02a.cc
@@ -72,7 +72,7 @@ void check()
   // Create the coloring
   std::vector<std::vector<typename DoFHandler<dim>::active_cell_iterator> > coloring(
       GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(),
-        std_cxx1x::function<std::vector<types::global_dof_index> (typename
+        std_cxx11::function<std::vector<types::global_dof_index> (typename
           DoFHandler<dim>::active_cell_iterator const &)> (&get_conflict_indices_cfem<dim>)));
 
   // verify that within each color, there is no conflict

diff --git a/tests/base/graph_coloring_03.cc b/tests/base/graph_coloring_03.cc
index 917ab49e8c7d171ea2e2aee023f66edd6b5ffff7..5e1cf678197238bc67928e84481df25a224d2d38 100644 (file)
--- a/tests/base/graph_coloring_03.cc
+++ b/tests/base/graph_coloring_03.cc
@@ -70,7 +70,7 @@ void check()
   // Create the coloring
   std::vector<std::vector<typename hp::DoFHandler<dim>::active_cell_iterator> > coloring(
       GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(),
-        std_cxx1x::function<std::vector<types::global_dof_index> (typename 
+        std_cxx11::function<std::vector<types::global_dof_index> (typename 
           hp::DoFHandler<dim>::active_cell_iterator const &)> (&get_conflict_indices_cfem<dim>)));
 
   // Output the coloring

diff --git a/tests/base/graph_coloring_04.cc b/tests/base/graph_coloring_04.cc
index a886c8b9af63a8a01999fd20e2a39c31dc2faa7c..62999cd7f98fe17c4b86045ce568c30d9a9a90a8 100644 (file)
--- a/tests/base/graph_coloring_04.cc
+++ b/tests/base/graph_coloring_04.cc
@@ -82,7 +82,7 @@ void check ()
   std::vector<std::vector<typename DoFHandler<dim>::active_cell_iterator> > coloring 
     = GraphColoring::make_graph_coloring(stokes_dof_handler.begin_active(),
         stokes_dof_handler.end(),
-        std_cxx1x::function<std::vector<types::global_dof_index> (
+        std_cxx11::function<std::vector<types::global_dof_index> (
           const typename DoFHandler<dim>::active_cell_iterator &)>(&get_conflict_indices<dim>));
 
   for (unsigned int c=0; c<coloring.size(); ++c)

diff --git a/tests/base/graph_coloring_05.cc b/tests/base/graph_coloring_05.cc
index a14021c9731a5269b61a52f859c43a6335ec41fa..97e95da0131abcd0f177a40e867d6070b50dbf20 100644 (file)
--- a/tests/base/graph_coloring_05.cc
+++ b/tests/base/graph_coloring_05.cc
@@ -69,7 +69,7 @@ void check()
   // Create the coloring
   std::vector<std::vector<typename DoFHandler<dim>::active_cell_iterator> > coloring(
       GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(),
-        std_cxx1x::function<std::vector<types::global_dof_index> (typename 
+        std_cxx11::function<std::vector<types::global_dof_index> (typename 
           DoFHandler<dim>::active_cell_iterator const &)> (&get_conflict_indices_cfem<dim>)));
 
   // Check that a color does not contain a conflict index twice

diff --git a/tests/base/graph_coloring_06.cc b/tests/base/graph_coloring_06.cc
index 744fee478e6d38bb8a68b85713822d3b0b878862..9f41c665bfe9122ec6c9f993f9485fe554d67721 100644 (file)
--- a/tests/base/graph_coloring_06.cc
+++ b/tests/base/graph_coloring_06.cc
@@ -76,7 +76,7 @@ void check()
     coloring
     = GraphColoring::make_graph_coloring(dof_handler.begin_active(),
                                         dof_handler.end(),
-                                        std_cxx1x::function<std::vector<types::global_dof_index>
+                                        std_cxx11::function<std::vector<types::global_dof_index>
                                         (typename DoFHandler<dim>::active_cell_iterator const &)>
                                         (&get_conflict_indices_cfem<dim>));
 

diff --git a/tests/base/named_data.cc b/tests/base/named_data.cc
index 068263e0f10660a559d6c0f3f2877b577521d68b..e9f61abc6082375bc74f7aee8883a04250038c55 100644 (file)
--- a/tests/base/named_data.cc
+++ b/tests/base/named_data.cc
@@ -57,17 +57,17 @@ test_selector(const NamedData<DATA> &data)
 void
 test_shared_pointer()
 {
-  NamedData<std_cxx1x::shared_ptr<double> > data;
+  NamedData<std_cxx11::shared_ptr<double> > data;
   deallog << "const" << data.is_const() << std::endl;
-  std_cxx1x::shared_ptr<double> p = std_cxx1x::shared_ptr<double>(new double);
+  std_cxx11::shared_ptr<double> p = std_cxx11::shared_ptr<double>(new double);
   data.add(p, "P1");
-  p = std_cxx1x::shared_ptr<double>(new double);
+  p = std_cxx11::shared_ptr<double>(new double);
   data.add(p, "P2");
-  p = std_cxx1x::shared_ptr<double>(new double);
+  p = std_cxx11::shared_ptr<double>(new double);
   data.add(p, "P3");
-  p = std_cxx1x::shared_ptr<double>(new double);
+  p = std_cxx11::shared_ptr<double>(new double);
   data.add(p, "P4");
-  p = std_cxx1x::shared_ptr<double>(new double);
+  p = std_cxx11::shared_ptr<double>(new double);
   data.add(p, "P5");
 
   for (unsigned int i=0; i<data.size(); ++i)

diff --git a/tests/base/time_stepping_01.cc b/tests/base/time_stepping_01.cc
index ec58d4fe6c6bfd2a0c0ba6cd18fa74dfb0710112..7958accd68b78121125f34b5964a050735ddccd7 100644 (file)
--- a/tests/base/time_stepping_01.cc
+++ b/tests/base/time_stepping_01.cc
@@ -116,9 +116,9 @@ double my5(double const t)
 }
 
 void test(TimeStepping::RungeKutta<Vector<double> > &solver,
-    std_cxx1x::function<Vector<double> (double const, Vector<double> const &)> f,
-    std_cxx1x::function<Vector<double> (double const, double const, Vector<double> const &)> id_minus_tau_J_inv,
-    std_cxx1x::function<double (double const)> my)
+    std_cxx11::function<Vector<double> (double const, Vector<double> const &)> f,
+    std_cxx11::function<Vector<double> (double const, double const, Vector<double> const &)> id_minus_tau_J_inv,
+    std_cxx11::function<double (double const)> my)
 {
   unsigned int n_time_steps = 1;
   unsigned int size = 1;
@@ -143,9 +143,9 @@ void test(TimeStepping::RungeKutta<Vector<double> > &solver,
 }
 
 void test2(TimeStepping::EmbeddedExplicitRungeKutta<Vector<double> > &solver,
-    std_cxx1x::function<Vector<double> (double const, Vector<double> const &)> f,
-    std_cxx1x::function<Vector<double> (double const, double const, Vector<double> const &)> id_minus_tau_J_inv,
-    std_cxx1x::function<double (double const)> my)
+    std_cxx11::function<Vector<double> (double const, Vector<double> const &)> f,
+    std_cxx11::function<Vector<double> (double const, double const, Vector<double> const &)> id_minus_tau_J_inv,
+    std_cxx11::function<double (double const)> my)
 {
   double initial_time = 0.0, final_time = 1.0;
   double time_step = 1.0;

diff --git a/tests/base/work_stream_03.cc b/tests/base/work_stream_03.cc
index 2916819181d56b34e1fa5739cf59565122706df9..6a95d7d637a013047a85b8ac87fec2c1dd90189c 100644 (file)
--- a/tests/base/work_stream_03.cc
+++ b/tests/base/work_stream_03.cc
@@ -113,8 +113,8 @@ mass_assembler(const typename Triangulation<dim>::active_cell_iterator &cell,
   // this appears to be the key: the following two ways both overwrite some
   // of the memory in which we store the quadrature point location.
   parallel::apply_to_subranges(0U, copy_data.cell_rhs.size(),
-                               std_cxx1x::bind(&zero_subrange, std_cxx1x::_1, std_cxx1x::_2,
-                                               std_cxx1x::ref(copy_data.cell_rhs)), 1);
+                               std_cxx11::bind(&zero_subrange, std_cxx11::_1, std_cxx11::_2,
+                                               std_cxx11::ref(copy_data.cell_rhs)), 1);
 
   Assert(q == data.x_fe_values.quadrature_point(0),
          ExcInternalError());
@@ -152,7 +152,7 @@ do_project()
       copy_data.cell_rhs.resize(8);
       WorkStream::run(triangulation.begin_active(), triangulation.end(),
                       &mass_assembler<dim>,
-                      std_cxx1x::bind(&copy_local_to_global, std_cxx1x::_1, &sum),
+                      std_cxx11::bind(&copy_local_to_global, std_cxx11::_1, &sum),
                       assembler_data, copy_data, 8, 1);
 
       Assert (std::fabs(sum-288.) < 1e-12, ExcInternalError());

diff --git a/tests/base/work_stream_03_graph.cc b/tests/base/work_stream_03_graph.cc
index 4aface31adbde809d2a1a5e4ef5369b53df02da0..4cc0d24cceba1f30fdeb67813bc6c468bc8c4f7c 100644 (file)
--- a/tests/base/work_stream_03_graph.cc
+++ b/tests/base/work_stream_03_graph.cc
@@ -110,8 +110,8 @@ mass_assembler(const typename Triangulation<dim>::active_cell_iterator &cell,
   // this appears to be the key: the following two ways both overwrite some
   // of the memory in which we store the quadrature point location.
   parallel::apply_to_subranges(0U, copy_data.cell_rhs.size(),
-                               std_cxx1x::bind(&zero_subrange, std_cxx1x::_1, std_cxx1x::_2,
-                                               std_cxx1x::ref(copy_data.cell_rhs)), 1);
+                               std_cxx11::bind(&zero_subrange, std_cxx11::_1, std_cxx11::_2,
+                                               std_cxx11::ref(copy_data.cell_rhs)), 1);
 
   Assert(q == data.x_fe_values.quadrature_point(0),
          ExcInternalError());
@@ -159,11 +159,11 @@ do_project()
       copy_data.cell_rhs.resize(8);
       WorkStream::run(GraphColoring::make_graph_coloring (triangulation.begin_active(),
                                                          triangulation.end(),
-                                                         std_cxx1x::function<std::vector<types::global_dof_index>
+                                                         std_cxx11::function<std::vector<types::global_dof_index>
                                                                              (const Triangulation<dim>::active_cell_iterator &)>
                                                          (&conflictor<dim>)),
                       &mass_assembler<dim>,
-                      std_cxx1x::bind(&copy_local_to_global, std_cxx1x::_1, &sum),
+                      std_cxx11::bind(&copy_local_to_global, std_cxx11::_1, &sum),
                       assembler_data, copy_data, 8, 1);
 
       Assert (std::fabs(sum-288.) < 1e-12, ExcInternalError());

diff --git a/tests/base/work_stream_04.cc b/tests/base/work_stream_04.cc
index ebda814629d77d09675991510c98c029a4a4578a..5b4c4d2e98f28c36a36fb05e64aea420af02294d 100644 (file)
--- a/tests/base/work_stream_04.cc
+++ b/tests/base/work_stream_04.cc
@@ -49,13 +49,13 @@ void test ()
   // first run with only a worker
   WorkStream::run (v.begin(), v.end(),
                    &foo,
-                   std_cxx1x::function<void(const unsigned int&)>(),
+                   std_cxx11::function<void(const unsigned int&)>(),
                    ScratchData(),
                    0U);
   
   // next run with only a copier
   WorkStream::run (v.begin(), v.end(),
-                   std_cxx1x::function<void(const std::vector<unsigned int>::iterator,
+                   std_cxx11::function<void(const std::vector<unsigned int>::iterator,
                                             ScratchData&,unsigned int&)>(),
                    &bar,
                    ScratchData(),

diff --git a/tests/base/work_stream_05_graph.cc b/tests/base/work_stream_05_graph.cc
index c0c88a212712aaf84a4ac18e10fa849366ea132d..311e2b5702ebc9e290c095999e85742363217dee 100644 (file)
--- a/tests/base/work_stream_05_graph.cc
+++ b/tests/base/work_stream_05_graph.cc
@@ -76,7 +76,7 @@ void test ()
     v.push_back (i);
 
   WorkStream::run (GraphColoring::make_graph_coloring (v.begin(), v.end(),
-                                                      std_cxx1x::function<std::vector<types::global_dof_index>
+                                                      std_cxx11::function<std::vector<types::global_dof_index>
                                                                           (const std::vector<unsigned int>::iterator &)>
                                                       (&conflictor)),
                   &worker, &copier,

diff --git a/tests/benchmarks/step-22/step-22.cc b/tests/benchmarks/step-22/step-22.cc
index a5b00eee96a66d9aa4c64cab0d2ce8003a9c8997..a674c085462f151ca33fd9a9922d1b210f7df929 100644 (file)
--- a/tests/benchmarks/step-22/step-22.cc
+++ b/tests/benchmarks/step-22/step-22.cc
@@ -176,7 +176,7 @@ namespace Step22
     // memory leak, and can never produce a
     // dangling pointer to an already
     // destroyed object:
-    std_cxx1x::shared_ptr<typename InnerPreconditioner<dim>::type> A_preconditioner;
+    std_cxx11::shared_ptr<typename InnerPreconditioner<dim>::type> A_preconditioner;
 
     TimerOutput timer;
   };
@@ -978,7 +978,7 @@ namespace Step22
     std::cout << "   Computing preconditioner..." << std::endl << std::flush;
 
     A_preconditioner
-      = std_cxx1x::shared_ptr<typename InnerPreconditioner<dim>::type>(new typename InnerPreconditioner<dim>::type());
+      = std_cxx11::shared_ptr<typename InnerPreconditioner<dim>::type>(new typename InnerPreconditioner<dim>::type());
     A_preconditioner->initialize (system_matrix.block(0,0),
                                   typename InnerPreconditioner<dim>::type::AdditionalData());
 

diff --git a/tests/benchmarks/test_assembly/step-22.cc b/tests/benchmarks/test_assembly/step-22.cc
index b645bb79840926704fd7ca52c4b6d0fe72fd4b1a..2435277088ae6ef51357016f0ccbebe5e02001b5 100644 (file)
--- a/tests/benchmarks/test_assembly/step-22.cc
+++ b/tests/benchmarks/test_assembly/step-22.cc
@@ -177,7 +177,7 @@ namespace Step22
     // memory leak, and can never produce a
     // dangling pointer to an already
     // destroyed object:
-    std_cxx1x::shared_ptr<typename InnerPreconditioner<dim>::type> A_preconditioner;
+    std_cxx11::shared_ptr<typename InnerPreconditioner<dim>::type> A_preconditioner;
 
     TimerOutput timer;
   };
@@ -954,7 +954,7 @@ namespace Step22
     std::cout << "   Computing preconditioner..." << std::endl << std::flush;
 
     A_preconditioner
-      = std_cxx1x::shared_ptr<typename InnerPreconditioner<dim>::type>(new typename InnerPreconditioner<dim>::type());
+      = std_cxx11::shared_ptr<typename InnerPreconditioner<dim>::type>(new typename InnerPreconditioner<dim>::type());
     A_preconditioner->initialize (system_matrix.block(0,0),
                                   typename InnerPreconditioner<dim>::type::AdditionalData());
 

diff --git a/tests/bits/data_out_04.cc b/tests/bits/data_out_04.cc
index c525c2bfe416cf96a363c19f256d92aace26baeb..30ba5d1189f2b7358fc77359f8e1ed57be69db5d 100644 (file)
--- a/tests/bits/data_out_04.cc
+++ b/tests/bits/data_out_04.cc
@@ -49,16 +49,16 @@ public:
     return DataOut<dim>::get_dataset_names();
   }
 
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> >
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> >
   get_vector_data_ranges () const
   {
     // if we have enough components for a
     // vector solution, make the last dim
     // components a vector
-    std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> >
+    std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> >
     retval;
     if (get_dataset_names().size() >= dim)
-      retval.push_back (std_cxx1x::tuple
+      retval.push_back (std_cxx11::tuple
                         <unsigned int, unsigned int, std::string>
                         (get_dataset_names().size()-dim,
                          get_dataset_names().size()-1,
@@ -85,7 +85,7 @@ public:
     return DataOutReader<dim>::get_dataset_names();
   }
 
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> >
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> >
   get_vector_data_ranges () const
   {
     return DataOutReader<dim>::get_vector_data_ranges ();
@@ -136,23 +136,23 @@ check_this (const DoFHandler<dim> &dof_handler,
           ExcInternalError());
   for (unsigned int i=0; i<data_out.get_vector_data_ranges().size(); ++i)
     {
-      deallog << std_cxx1x::get<0>(data_out.get_vector_data_ranges()[i])
+      deallog << std_cxx11::get<0>(data_out.get_vector_data_ranges()[i])
               << ' '
-              << std_cxx1x::get<1>(data_out.get_vector_data_ranges()[i])
+              << std_cxx11::get<1>(data_out.get_vector_data_ranges()[i])
               << ' '
-              << std_cxx1x::get<2>(data_out.get_vector_data_ranges()[i])
+              << std_cxx11::get<2>(data_out.get_vector_data_ranges()[i])
               << std::endl;
-      Assert (std_cxx1x::get<0>(data_out.get_vector_data_ranges()[i])
+      Assert (std_cxx11::get<0>(data_out.get_vector_data_ranges()[i])
               ==
-              std_cxx1x::get<0>(reader.get_vector_data_ranges()[i]),
+              std_cxx11::get<0>(reader.get_vector_data_ranges()[i]),
               ExcInternalError());
-      Assert (std_cxx1x::get<1>(data_out.get_vector_data_ranges()[i])
+      Assert (std_cxx11::get<1>(data_out.get_vector_data_ranges()[i])
               ==
-              std_cxx1x::get<1>(reader.get_vector_data_ranges()[i]),
+              std_cxx11::get<1>(reader.get_vector_data_ranges()[i]),
               ExcInternalError());
-      Assert (std_cxx1x::get<2>(data_out.get_vector_data_ranges()[i])
+      Assert (std_cxx11::get<2>(data_out.get_vector_data_ranges()[i])
               ==
-              std_cxx1x::get<2>(reader.get_vector_data_ranges()[i]),
+              std_cxx11::get<2>(reader.get_vector_data_ranges()[i]),
               ExcInternalError());
     }
 

diff --git a/tests/bits/data_out_faces_04.cc b/tests/bits/data_out_faces_04.cc
index 9c4a5402abdc6c1e822afb1a8e713aac345103c6..a03ff9c6d1df3164817f02e10f92adb6027a2c5a 100644 (file)
--- a/tests/bits/data_out_faces_04.cc
+++ b/tests/bits/data_out_faces_04.cc
@@ -49,7 +49,7 @@ public:
     return DataOutFaces<dim>::get_dataset_names();
   }
 
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> >
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> >
   get_vector_data_ranges () const
   {
     return DataOutFaces<dim>::get_vector_data_ranges ();
@@ -74,7 +74,7 @@ public:
     return DataOutReader<dim-1,dim>::get_dataset_names();
   }
 
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> >
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> >
   get_vector_data_ranges () const
   {
     return DataOutReader<dim-1,dim>::get_vector_data_ranges ();
@@ -137,23 +137,23 @@ my_check_this (const DoFHandler<dim> &dof_handler,
           ExcInternalError());
   for (unsigned int i=0; i<data_out.get_vector_data_ranges().size(); ++i)
     {
-      deallog << std_cxx1x::get<0>(data_out.get_vector_data_ranges()[i])
+      deallog << std_cxx11::get<0>(data_out.get_vector_data_ranges()[i])
               << ' '
-              << std_cxx1x::get<1>(data_out.get_vector_data_ranges()[i])
+              << std_cxx11::get<1>(data_out.get_vector_data_ranges()[i])
               << ' '
-              << std_cxx1x::get<2>(data_out.get_vector_data_ranges()[i])
+              << std_cxx11::get<2>(data_out.get_vector_data_ranges()[i])
               << std::endl;
-      Assert (std_cxx1x::get<0>(data_out.get_vector_data_ranges()[i])
+      Assert (std_cxx11::get<0>(data_out.get_vector_data_ranges()[i])
               ==
-              std_cxx1x::get<0>(reader.get_vector_data_ranges()[i]),
+              std_cxx11::get<0>(reader.get_vector_data_ranges()[i]),
               ExcInternalError());
-      Assert (std_cxx1x::get<1>(data_out.get_vector_data_ranges()[i])
+      Assert (std_cxx11::get<1>(data_out.get_vector_data_ranges()[i])
               ==
-              std_cxx1x::get<1>(reader.get_vector_data_ranges()[i]),
+              std_cxx11::get<1>(reader.get_vector_data_ranges()[i]),
               ExcInternalError());
-      Assert (std_cxx1x::get<2>(data_out.get_vector_data_ranges()[i])
+      Assert (std_cxx11::get<2>(data_out.get_vector_data_ranges()[i])
               ==
-              std_cxx1x::get<2>(reader.get_vector_data_ranges()[i]),
+              std_cxx11::get<2>(reader.get_vector_data_ranges()[i]),
               ExcInternalError());
     }
 

diff --git a/tests/bits/data_out_rotation_04.cc b/tests/bits/data_out_rotation_04.cc
index d33bf1678bfd7e3384c0bfd57c9ee83bed621cfd..c24df1138c6429b71b7cf9bc3c340603c297ed60 100644 (file)
--- a/tests/bits/data_out_rotation_04.cc
+++ b/tests/bits/data_out_rotation_04.cc
@@ -49,7 +49,7 @@ public:
     return DataOutRotation<dim>::get_dataset_names();
   }
 
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> >
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> >
   get_vector_data_ranges () const
   {
     return DataOutRotation<dim>::get_vector_data_ranges ();
@@ -74,7 +74,7 @@ public:
     return DataOutReader<dim+1>::get_dataset_names();
   }
 
-  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> >
+  std::vector<std_cxx11::tuple<unsigned int, unsigned int, std::string> >
   get_vector_data_ranges () const
   {
     return DataOutReader<dim+1>::get_vector_data_ranges ();
@@ -138,23 +138,23 @@ my_check_this (const DoFHandler<dim> &dof_handler,
           ExcInternalError());
   for (unsigned int i=0; i<data_out.get_vector_data_ranges().size(); ++i)
     {
-      deallog << std_cxx1x::get<0>(data_out.get_vector_data_ranges()[i])
+      deallog << std_cxx11::get<0>(data_out.get_vector_data_ranges()[i])
               << ' '
-              << std_cxx1x::get<1>(data_out.get_vector_data_ranges()[i])
+              << std_cxx11::get<1>(data_out.get_vector_data_ranges()[i])
               << ' '
-              << std_cxx1x::get<2>(data_out.get_vector_data_ranges()[i])
+              << std_cxx11::get<2>(data_out.get_vector_data_ranges()[i])
               << std::endl;
-      Assert (std_cxx1x::get<0>(data_out.get_vector_data_ranges()[i])
+      Assert (std_cxx11::get<0>(data_out.get_vector_data_ranges()[i])
               ==
-              std_cxx1x::get<0>(reader.get_vector_data_ranges()[i]),
+              std_cxx11::get<0>(reader.get_vector_data_ranges()[i]),
               ExcInternalError());
-      Assert (std_cxx1x::get<1>(data_out.get_vector_data_ranges()[i])
+      Assert (std_cxx11::get<1>(data_out.get_vector_data_ranges()[i])
               ==
-              std_cxx1x::get<1>(reader.get_vector_data_ranges()[i]),
+              std_cxx11::get<1>(reader.get_vector_data_ranges()[i]),
               ExcInternalError());
-      Assert (std_cxx1x::get<2>(data_out.get_vector_data_ranges()[i])
+      Assert (std_cxx11::get<2>(data_out.get_vector_data_ranges()[i])
               ==
-              std_cxx1x::get<2>(reader.get_vector_data_ranges()[i]),
+              std_cxx11::get<2>(reader.get_vector_data_ranges()[i]),
               ExcInternalError());
     }
 

diff --git a/tests/bits/step-51.cc b/tests/bits/step-51.cc
index 10bd4e64ed9c989c87daff789d1ff5e03411aac9..c39dfaeea6a44595c8506ccb6ea71e8b42547ddc 100644 (file)
--- a/tests/bits/step-51.cc
+++ b/tests/bits/step-51.cc
@@ -796,10 +796,10 @@ namespace Step51
 
       WorkStream::run(dof_handler_u_post.begin_active(),
                       dof_handler_u_post.end(),
-                      std_cxx1x::bind (&HDG<dim>::postprocess_one_cell,
-                                       std_cxx1x::ref(*this),
-                                       std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3),
-                      std_cxx1x::function<void(const unsigned int &)>(),
+                      std_cxx11::bind (&HDG<dim>::postprocess_one_cell,
+                                       std_cxx11::ref(*this),
+                                       std_cxx11::_1, std_cxx11::_2, std_cxx11::_3),
+                      std_cxx11::function<void(const unsigned int &)>(),
                       scratch,
                       0U);
     }

diff --git a/tests/bits/step-51p.cc b/tests/bits/step-51p.cc
index 5fea2153af24c79c328690a3b35d1c5a34146d13..4d15d434d719565bc41862403b243551e4101c31 100644 (file)
--- a/tests/bits/step-51p.cc
+++ b/tests/bits/step-51p.cc
@@ -794,10 +794,10 @@ namespace Step51
 
       WorkStream::run(dof_handler_u_post.begin_active(),
                       dof_handler_u_post.end(),
-                      std_cxx1x::bind (&HDG<dim>::postprocess_one_cell,
-                                       std_cxx1x::ref(*this),
-                                       std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3),
-                      std_cxx1x::function<void(const unsigned int &)>(),
+                      std_cxx11::bind (&HDG<dim>::postprocess_one_cell,
+                                       std_cxx11::ref(*this),
+                                       std_cxx11::_1, std_cxx11::_2, std_cxx11::_3),
+                      std_cxx11::function<void(const unsigned int &)>(),
                       scratch,
                       0U);
     }

diff --git a/tests/deal.II/assemble_matrix_parallel_01.cc b/tests/deal.II/assemble_matrix_parallel_01.cc
index fb9dff26213bf8c3d309eba1f4b09566b079efc8..92657db966c7700e645bba88d03cb3643ee8fb4e 100644 (file)
--- a/tests/deal.II/assemble_matrix_parallel_01.cc
+++ b/tests/deal.II/assemble_matrix_parallel_01.cc
@@ -260,9 +260,9 @@ void LaplaceProblem<dim>::setup_system ()
   constraints.close ();
 
   graph = GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(),
-                                             static_cast<std_cxx1x::function<std::vector<types::global_dof_index>
+                                             static_cast<std_cxx11::function<std::vector<types::global_dof_index>
                                              (typename hp::DoFHandler<dim>::active_cell_iterator const &)> >
-                                             (std_cxx1x::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx1x::_1)));
+                                             (std_cxx11::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx11::_1)));
 
 
   CompressedSimpleSparsityPattern csp (dof_handler.n_dofs(),
@@ -363,16 +363,16 @@ void LaplaceProblem<dim>::assemble_test ()
 
   WorkStream::
     run (graph,
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           local_assemble,
                           this,
-                          std_cxx1x::_1,
-                          std_cxx1x::_2,
-                          std_cxx1x::_3),
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+                          std_cxx11::_1,
+                          std_cxx11::_2,
+                          std_cxx11::_3),
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           copy_local_to_global,
                           this,
-                          std_cxx1x::_1),
+                          std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe_collection, quadrature_collection),
          Assembly::Copy::Data ());
 

diff --git a/tests/deal.II/assemble_matrix_parallel_02.cc b/tests/deal.II/assemble_matrix_parallel_02.cc
index c3e51ddd6d524fb52bc58b034944cc339b0007f0..406e424bea89c39db1e50794cfa44cff9e9be5c8 100644 (file)
--- a/tests/deal.II/assemble_matrix_parallel_02.cc
+++ b/tests/deal.II/assemble_matrix_parallel_02.cc
@@ -278,9 +278,9 @@ void LaplaceProblem<dim>::setup_system ()
   constraints.close ();
 
   graph = GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(),
-                                             static_cast<std_cxx1x::function<std::vector<types::global_dof_index>
+                                             static_cast<std_cxx11::function<std::vector<types::global_dof_index>
                                              (typename hp::DoFHandler<dim>::active_cell_iterator const &)> >
-                                             (std_cxx1x::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx1x::_1)));
+                                             (std_cxx11::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx11::_1)));
 
 
   CompressedSimpleSparsityPattern csp (dof_handler.n_dofs(),
@@ -389,16 +389,16 @@ void LaplaceProblem<dim>::assemble_test_1 ()
 
   WorkStream::
     run (graph,
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           local_assemble,
                           this,
-                          std_cxx1x::_1,
-                          std_cxx1x::_2,
-                          std_cxx1x::_3),
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+                          std_cxx11::_1,
+                          std_cxx11::_2,
+                          std_cxx11::_3),
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           copy_local_to_global,
                           this,
-                          std_cxx1x::_1),
+                          std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe_collection, quadrature_collection),
          Assembly::Copy::Data (),
          multithread_info.n_threads(),
@@ -414,16 +414,16 @@ void LaplaceProblem<dim>::assemble_test_2 ()
 
   WorkStream::
     run (graph,
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           local_assemble,
                           this,
-                          std_cxx1x::_1,
-                          std_cxx1x::_2,
-                          std_cxx1x::_3),
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+                          std_cxx11::_1,
+                          std_cxx11::_2,
+                          std_cxx11::_3),
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           copy_local_to_global,
                           this,
-                          std_cxx1x::_1),
+                          std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe_collection, quadrature_collection),
          Assembly::Copy::Data (true),
          2*multithread_info.n_threads(),

diff --git a/tests/deal.II/assemble_matrix_parallel_03.cc b/tests/deal.II/assemble_matrix_parallel_03.cc
index 158aec8ba760f6a67afa221269954f67b4916dd2..b39e4cc65eb6e597a14e6786ae2006346e0cc708 100644 (file)
--- a/tests/deal.II/assemble_matrix_parallel_03.cc
+++ b/tests/deal.II/assemble_matrix_parallel_03.cc
@@ -260,9 +260,9 @@ void LaplaceProblem<dim>::setup_system ()
   constraints.close ();
 
   graph = GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(),
-                                             static_cast<std_cxx1x::function<std::vector<types::global_dof_index>
+                                             static_cast<std_cxx11::function<std::vector<types::global_dof_index>
                                              (typename hp::DoFHandler<dim>::active_cell_iterator const &)> >
-                                             (std_cxx1x::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx1x::_1)));
+                                             (std_cxx11::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx11::_1)));
 
 
   BlockCompressedSimpleSparsityPattern csp (2, 2);
@@ -367,16 +367,16 @@ void LaplaceProblem<dim>::assemble_test ()
 
   WorkStream::
     run (graph,
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           local_assemble,
                           this,
-                          std_cxx1x::_1,
-                          std_cxx1x::_2,
-                          std_cxx1x::_3),
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+                          std_cxx11::_1,
+                          std_cxx11::_2,
+                          std_cxx11::_3),
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           copy_local_to_global,
                           this,
-                          std_cxx1x::_1),
+                          std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe_collection, quadrature_collection),
          Assembly::Copy::Data ());
 

diff --git a/tests/deal.II/assemble_matrix_parallel_04.cc b/tests/deal.II/assemble_matrix_parallel_04.cc
index 18cdb2b70738c4c9a02a72c823b84ff624666934..f8c8c27d9da440131b8eaef302397b2a6d5f642e 100644 (file)
--- a/tests/deal.II/assemble_matrix_parallel_04.cc
+++ b/tests/deal.II/assemble_matrix_parallel_04.cc
@@ -290,9 +290,9 @@ void LaplaceProblem<dim>::setup_system ()
   constraints.close ();
 
   graph = GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(),
-                                             static_cast<std_cxx1x::function<std::vector<types::global_dof_index>
+                                             static_cast<std_cxx11::function<std::vector<types::global_dof_index>
                                              (typename hp::DoFHandler<dim>::active_cell_iterator const &)> >
-                                             (std_cxx1x::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx1x::_1)));
+                                             (std_cxx11::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx11::_1)));
 
 
   CompressedSimpleSparsityPattern csp (dof_handler.n_dofs(),
@@ -417,16 +417,16 @@ void LaplaceProblem<dim>::assemble_test_1 ()
 
   WorkStream::
     run (graph,
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           local_assemble,
                           this,
-                          std_cxx1x::_1,
-                          std_cxx1x::_2,
-                          std_cxx1x::_3),
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+                          std_cxx11::_1,
+                          std_cxx11::_2,
+                          std_cxx11::_3),
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           copy_local_to_global,
                           this,
-                          std_cxx1x::_1),
+                          std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe_collection, quadrature_collection),
          Assembly::Copy::Data (1),
          2*multithread_info.n_threads(),
@@ -448,16 +448,16 @@ void LaplaceProblem<dim>::assemble_test_2 ()
 
   WorkStream::
     run (graph,
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           local_assemble,
                           this,
-                          std_cxx1x::_1,
-                          std_cxx1x::_2,
-                          std_cxx1x::_3),
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+                          std_cxx11::_1,
+                          std_cxx11::_2,
+                          std_cxx11::_3),
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           copy_local_to_global,
                           this,
-                          std_cxx1x::_1),
+                          std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe_collection, quadrature_collection),
          Assembly::Copy::Data (2),
          2*multithread_info.n_threads(),

diff --git a/tests/deal.II/dof_renumbering_02.cc b/tests/deal.II/dof_renumbering_02.cc
index 2b7d6bfc4651b7dd10c5c6eecd97323126871af0..08c2fd87121c7e7b20bf6fbcf3f6a117a6e4741f 100644 (file)
--- a/tests/deal.II/dof_renumbering_02.cc
+++ b/tests/deal.II/dof_renumbering_02.cc
@@ -45,12 +45,12 @@ print_dofs (const DoFHandler<dim> &dof)
 {
   const FiniteElement<dim> &fe = dof.get_fe();
   std::vector<types::global_dof_index> v (fe.dofs_per_cell);
-  std_cxx1x::shared_ptr<FEValues<dim> > fevalues;
+  std_cxx11::shared_ptr<FEValues<dim> > fevalues;
 
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx1x::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
     }
 
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();
@@ -78,12 +78,12 @@ print_dofs (const MGDoFHandler<dim> &dof, unsigned int level)
 {
   const FiniteElement<dim> &fe = dof.get_fe();
   std::vector<types::global_dof_index> v (fe.dofs_per_cell);
-  std_cxx1x::shared_ptr<FEValues<dim> > fevalues;
+  std_cxx11::shared_ptr<FEValues<dim> > fevalues;
 
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx1x::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
     }
 
   for (typename MGDoFHandler<dim>::cell_iterator cell=dof.begin(level);

diff --git a/tests/deal.II/dof_renumbering_03.cc b/tests/deal.II/dof_renumbering_03.cc
index 0686b5341d798cd8aa201ac6f95c1f77a9d0b616..a1034b86f154dac93d2742cb52018c83141ae3c0 100644 (file)
--- a/tests/deal.II/dof_renumbering_03.cc
+++ b/tests/deal.II/dof_renumbering_03.cc
@@ -45,12 +45,12 @@ print_dofs (const DoFHandler<dim> &dof)
 {
   const FiniteElement<dim> &fe = dof.get_fe();
   std::vector<types::global_dof_index> v (fe.dofs_per_cell);
-  std_cxx1x::shared_ptr<FEValues<dim> > fevalues;
+  std_cxx11::shared_ptr<FEValues<dim> > fevalues;
 
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx1x::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
     }
 
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();

diff --git a/tests/deal.II/dof_renumbering_04.cc b/tests/deal.II/dof_renumbering_04.cc
index 58da5678ea0a37fabfe58010531948c9181c708d..ed88cd6a4a5f314ba2f96934cb72fb9e4ddff2ff 100644 (file)
--- a/tests/deal.II/dof_renumbering_04.cc
+++ b/tests/deal.II/dof_renumbering_04.cc
@@ -45,12 +45,12 @@ print_dofs (const DoFHandler<dim> &dof)
 {
   const FiniteElement<dim> &fe = dof.get_fe();
   std::vector<types::global_dof_index> v (fe.dofs_per_cell);
-  std_cxx1x::shared_ptr<FEValues<dim> > fevalues;
+  std_cxx11::shared_ptr<FEValues<dim> > fevalues;
 
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx1x::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
     }
 
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();

diff --git a/tests/deal.II/dof_renumbering_05.cc b/tests/deal.II/dof_renumbering_05.cc
index 2403cab37c7299903b360ed4ca69525791f2d1f8..f9f5df1dcb47eb689ea90d0dc5083f90d4179b37 100644 (file)
--- a/tests/deal.II/dof_renumbering_05.cc
+++ b/tests/deal.II/dof_renumbering_05.cc
@@ -45,12 +45,12 @@ print_dofs (const DoFHandler<dim> &dof)
 {
   const FiniteElement<dim> &fe = dof.get_fe();
   std::vector<types::global_dof_index> v (fe.dofs_per_cell);
-  std_cxx1x::shared_ptr<FEValues<dim> > fevalues;
+  std_cxx11::shared_ptr<FEValues<dim> > fevalues;
 
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx1x::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
     }
 
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();

diff --git a/tests/deal.II/dof_renumbering_06.cc b/tests/deal.II/dof_renumbering_06.cc
index f50e4873790cb61783f8e63f065bfefaaa1fc6bd..eedd5f9fa78b027b06657fd3236c0b7911522c6c 100644 (file)
--- a/tests/deal.II/dof_renumbering_06.cc
+++ b/tests/deal.II/dof_renumbering_06.cc
@@ -45,12 +45,12 @@ print_dofs (const DoFHandler<dim> &dof)
 {
   const FiniteElement<dim> &fe = dof.get_fe();
   std::vector<types::global_dof_index> v (fe.dofs_per_cell);
-  std_cxx1x::shared_ptr<FEValues<dim> > fevalues;
+  std_cxx11::shared_ptr<FEValues<dim> > fevalues;
 
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx1x::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
     }
 
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();

diff --git a/tests/deal.II/dof_renumbering_07.cc b/tests/deal.II/dof_renumbering_07.cc
index db70f9a2325420cc761bedd4e8751df8c5255877..74f02e05066a0eeb428cb7fc82d0804b158a11de 100644 (file)
--- a/tests/deal.II/dof_renumbering_07.cc
+++ b/tests/deal.II/dof_renumbering_07.cc
@@ -44,12 +44,12 @@ print_dofs (const DoFHandler<dim> &dof)
 {
   const FiniteElement<dim> &fe = dof.get_fe();
   std::vector<types::global_dof_index> v (fe.dofs_per_cell);
-  std_cxx1x::shared_ptr<FEValues<dim> > fevalues;
+  std_cxx11::shared_ptr<FEValues<dim> > fevalues;
 
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx1x::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
     }
 
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();

diff --git a/tests/deal.II/dof_renumbering_zorder_01.cc b/tests/deal.II/dof_renumbering_zorder_01.cc
index 7f76b889425fdd3ecb4e2756b8479544751fb0e6..846b6c9d6658ef3218ea12040a9e9a660dfab3a5 100644 (file)
--- a/tests/deal.II/dof_renumbering_zorder_01.cc
+++ b/tests/deal.II/dof_renumbering_zorder_01.cc
@@ -43,12 +43,12 @@ print_dofs (const DoFHandler<dim> &dof, stream &out)
 {
   const FiniteElement<dim> &fe = dof.get_fe();
   std::vector<types::global_dof_index> v (fe.dofs_per_cell);
-  std_cxx1x::shared_ptr<FEValues<dim> > fevalues;
+  std_cxx11::shared_ptr<FEValues<dim> > fevalues;
 
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx1x::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
     }
 
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();

diff --git a/tests/deal.II/dof_renumbering_zorder_02.cc b/tests/deal.II/dof_renumbering_zorder_02.cc
index a5522fd2a5e7cf78e72882957d1f85053e535c70..865d70d5bf361b3b51efd613355179745e2667c2 100644 (file)
--- a/tests/deal.II/dof_renumbering_zorder_02.cc
+++ b/tests/deal.II/dof_renumbering_zorder_02.cc
@@ -46,12 +46,12 @@ print_dofs (const DoFHandler<dim> &dof, stream &out)
   out << std::fixed;
   const FiniteElement<dim> &fe = dof.get_fe();
   std::vector<types::global_dof_index> v (fe.dofs_per_cell);
-  std_cxx1x::shared_ptr<FEValues<dim> > fevalues;
+  std_cxx11::shared_ptr<FEValues<dim> > fevalues;
 
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx1x::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
     }
 
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();

diff --git a/tests/deal.II/refinement_listener_02.cc b/tests/deal.II/refinement_listener_02.cc
index 6279b4a0b8cdaa7d284c72597f94266f80785327..44844126f980f9c4a01dd6b5b72ec2a403fa8613 100644 (file)
--- a/tests/deal.II/refinement_listener_02.cc
+++ b/tests/deal.II/refinement_listener_02.cc
@@ -83,41 +83,41 @@ void test ()
 
   boost::signals2::connection connections_1[4]
     = {tria_1.signals.pre_refinement
-       .connect (std_cxx1x::bind (&pre_refinement_notification<dim,dim>,
+       .connect (std_cxx11::bind (&pre_refinement_notification<dim,dim>,
                                   "tria_1",
-                                  std_cxx1x::cref(tria_1))),
+                                  std_cxx11::cref(tria_1))),
        tria_1.signals.post_refinement
-       .connect (std_cxx1x::bind (&post_refinement_notification<dim,dim>,
+       .connect (std_cxx11::bind (&post_refinement_notification<dim,dim>,
                                   "tria_1",
-                                  std_cxx1x::cref(tria_1))),
+                                  std_cxx11::cref(tria_1))),
        tria_1.signals.create
-       .connect (std_cxx1x::bind (&create_notification<dim,dim>,
+       .connect (std_cxx11::bind (&create_notification<dim,dim>,
                                   "tria_1",
-                                  std_cxx1x::cref(tria_1))),
+                                  std_cxx11::cref(tria_1))),
        tria_1.signals.copy
-       .connect (std_cxx1x::bind (&copy_notification<dim,dim>,
+       .connect (std_cxx11::bind (&copy_notification<dim,dim>,
                                   "tria_1",
-                                  std_cxx1x::_1,
-                                  std_cxx1x::cref(tria_1)))
+                                  std_cxx11::_1,
+                                  std_cxx11::cref(tria_1)))
       };
   boost::signals2::connection connections_2[4]
     = {tria_2.signals.pre_refinement
-       .connect (std_cxx1x::bind (&pre_refinement_notification<dim,dim>,
+       .connect (std_cxx11::bind (&pre_refinement_notification<dim,dim>,
                                   "tria_2",
-                                  std_cxx1x::cref(tria_2))),
+                                  std_cxx11::cref(tria_2))),
        tria_2.signals.post_refinement
-       .connect (std_cxx1x::bind (&post_refinement_notification<dim,dim>,
+       .connect (std_cxx11::bind (&post_refinement_notification<dim,dim>,
                                   "tria_2",
-                                  std_cxx1x::cref(tria_2))),
+                                  std_cxx11::cref(tria_2))),
        tria_2.signals.create
-       .connect (std_cxx1x::bind (&create_notification<dim,dim>,
+       .connect (std_cxx11::bind (&create_notification<dim,dim>,
                                   "tria_2",
-                                  std_cxx1x::cref(tria_2))),
+                                  std_cxx11::cref(tria_2))),
        tria_2.signals.copy
-       .connect (std_cxx1x::bind (&copy_notification<dim,dim>,
+       .connect (std_cxx11::bind (&copy_notification<dim,dim>,
                                   "tria_2",
-                                  std_cxx1x::_1,
-                                  std_cxx1x::cref(tria_2)))
+                                  std_cxx11::_1,
+                                  std_cxx11::cref(tria_2)))
       };
 
 

diff --git a/tests/deal.II/refinement_listener_03.cc b/tests/deal.II/refinement_listener_03.cc
index 084648a06494ac5d0395d0727a5e001f787ea4e8..d820d9a63cb47871c56d96f850728db4b99ebdbf 100644 (file)
--- a/tests/deal.II/refinement_listener_03.cc
+++ b/tests/deal.II/refinement_listener_03.cc
@@ -92,49 +92,49 @@ void test ()
 
   boost::signals2::connection connections_1[5]
     = {tria_1.signals.pre_refinement
-       .connect (std_cxx1x::bind (&pre_refinement_notification<dim,dim>,
+       .connect (std_cxx11::bind (&pre_refinement_notification<dim,dim>,
                                   "tria_1",
-                                  std_cxx1x::cref(tria_1))),
+                                  std_cxx11::cref(tria_1))),
        tria_1.signals.post_refinement
-       .connect (std_cxx1x::bind (&post_refinement_notification<dim,dim>,
+       .connect (std_cxx11::bind (&post_refinement_notification<dim,dim>,
                                   "tria_1",
-                                  std_cxx1x::cref(tria_1))),
+                                  std_cxx11::cref(tria_1))),
        tria_1.signals.create
-       .connect (std_cxx1x::bind (&create_notification<dim,dim>,
+       .connect (std_cxx11::bind (&create_notification<dim,dim>,
                                   "tria_1",
-                                  std_cxx1x::cref(tria_1))),
+                                  std_cxx11::cref(tria_1))),
        tria_1.signals.copy
-       .connect (std_cxx1x::bind (&copy_notification<dim,dim>,
+       .connect (std_cxx11::bind (&copy_notification<dim,dim>,
                                   "tria_1",
-                                  std_cxx1x::_1,
-                                  std_cxx1x::cref(tria_1))),
+                                  std_cxx11::_1,
+                                  std_cxx11::cref(tria_1))),
        tria_1.signals.any_change
-       .connect (std_cxx1x::bind (&any_change_notification<dim,dim>,
+       .connect (std_cxx11::bind (&any_change_notification<dim,dim>,
                                   "tria_1",
-                                  std_cxx1x::cref(tria_1)))
+                                  std_cxx11::cref(tria_1)))
       };
   boost::signals2::connection connections_2[5]
     = {tria_2.signals.pre_refinement
-       .connect (std_cxx1x::bind (&pre_refinement_notification<dim,dim>,
+       .connect (std_cxx11::bind (&pre_refinement_notification<dim,dim>,
                                   "tria_2",
-                                  std_cxx1x::cref(tria_2))),
+                                  std_cxx11::cref(tria_2))),
        tria_2.signals.post_refinement
-       .connect (std_cxx1x::bind (&post_refinement_notification<dim,dim>,
+       .connect (std_cxx11::bind (&post_refinement_notification<dim,dim>,
                                   "tria_2",
-                                  std_cxx1x::cref(tria_2))),
+                                  std_cxx11::cref(tria_2))),
        tria_2.signals.create
-       .connect (std_cxx1x::bind (&create_notification<dim,dim>,
+       .connect (std_cxx11::bind (&create_notification<dim,dim>,
                                   "tria_2",
-                                  std_cxx1x::cref(tria_2))),
+                                  std_cxx11::cref(tria_2))),
        tria_2.signals.copy
-       .connect (std_cxx1x::bind (&copy_notification<dim,dim>,
+       .connect (std_cxx11::bind (&copy_notification<dim,dim>,
                                   "tria_2",
-                                  std_cxx1x::_1,
-                                  std_cxx1x::cref(tria_2))),
+                                  std_cxx11::_1,
+                                  std_cxx11::cref(tria_2))),
        tria_2.signals.any_change
-       .connect (std_cxx1x::bind (&any_change_notification<dim,dim>,
+       .connect (std_cxx11::bind (&any_change_notification<dim,dim>,
                                   "tria_2",
-                                  std_cxx1x::cref(tria_2)))
+                                  std_cxx11::cref(tria_2)))
       };
 
 

diff --git a/tests/fe/fe_q_dg0.cc b/tests/fe/fe_q_dg0.cc
index 7ee2e630dcb6cf167218485ea22ccf3aecf825dd..0c624ee9031b202faf87f0d0744c21225808a1f0 100644 (file)
--- a/tests/fe/fe_q_dg0.cc
+++ b/tests/fe/fe_q_dg0.cc
@@ -111,7 +111,7 @@ namespace Step22
     BlockVector<double> solution;
     BlockVector<double> system_rhs;
 
-    std_cxx1x::shared_ptr<typename InnerPreconditioner<dim>::type>
+    std_cxx11::shared_ptr<typename InnerPreconditioner<dim>::type>
     A_preconditioner;
 
     ConvergenceTable convergence_table;
@@ -627,7 +627,7 @@ namespace Step22
       }
 
     A_preconditioner
-      = std_cxx1x::shared_ptr<typename InnerPreconditioner<dim>::type>(new
+      = std_cxx11::shared_ptr<typename InnerPreconditioner<dim>::type>(new
           typename InnerPreconditioner<dim>::type());
     A_preconditioner->initialize (system_matrix.block(0,0),
                                   typename

diff --git a/tests/integrators/cells_and_faces_01.cc b/tests/integrators/cells_and_faces_01.cc
index 5a4063ae602270dbad53ec31147b85e34bc75f45..d8d92939a533839f587cc51be914e3905ff60f21 100644 (file)
--- a/tests/integrators/cells_and_faces_01.cc
+++ b/tests/integrators/cells_and_faces_01.cc
@@ -22,7 +22,7 @@
 #include <deal.II/meshworker/assembler.h>
 #include <deal.II/meshworker/loop.h>
 
-#include <deal.II/base/std_cxx1x/function.h>
+#include <deal.II/base/std_cxx11/function.h>
 #include <deal.II/base/logstream.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/dofs/dof_tools.h>
@@ -116,9 +116,9 @@ test_mesh(MGDoFHandler<dim> &mgdofs)
   MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, EmptyInfoBox>
   (dofs.begin_active(), dofs.end(),
    dof_info, info_box,
-   std_cxx1x::bind (&Local<dim>::cell, local, std_cxx1x::_1, std_cxx1x::_2),
-   std_cxx1x::bind (&Local<dim>::bdry, local, std_cxx1x::_1, std_cxx1x::_2),
-   std_cxx1x::bind (&Local<dim>::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4),
+   std_cxx11::bind (&Local<dim>::cell, local, std_cxx11::_1, std_cxx11::_2),
+   std_cxx11::bind (&Local<dim>::bdry, local, std_cxx11::_1, std_cxx11::_2),
+   std_cxx11::bind (&Local<dim>::face, local, std_cxx11::_1, std_cxx11::_2, std_cxx11::_3, std_cxx11::_4),
    assembler, true);
 
   deallog << "  Results cells";
@@ -138,9 +138,9 @@ test_mesh(MGDoFHandler<dim> &mgdofs)
   MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, EmptyInfoBox>
   (mgdofs.begin(), mgdofs.end(),
    mg_dof_info, info_box,
-   std_cxx1x::bind (&Local<dim>::cell, local, std_cxx1x::_1, std_cxx1x::_2),
-   std_cxx1x::bind (&Local<dim>::bdry, local, std_cxx1x::_1, std_cxx1x::_2),
-   std_cxx1x::bind (&Local<dim>::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4),
+   std_cxx11::bind (&Local<dim>::cell, local, std_cxx11::_1, std_cxx11::_2),
+   std_cxx11::bind (&Local<dim>::bdry, local, std_cxx11::_1, std_cxx11::_2),
+   std_cxx11::bind (&Local<dim>::face, local, std_cxx11::_1, std_cxx11::_2, std_cxx11::_3, std_cxx11::_4),
    assembler, true);
 
   deallog << "MGResults cells";

diff --git a/tests/integrators/functional_01.cc b/tests/integrators/functional_01.cc
index f9053ceb232f6e7caa80b7925399c108753736d9..58a7872363326f7e15b9319e2d8377c4817f0688 100644 (file)
--- a/tests/integrators/functional_01.cc
+++ b/tests/integrators/functional_01.cc
@@ -22,7 +22,7 @@
 #include <deal.II/meshworker/assembler.h>
 #include <deal.II/meshworker/loop.h>
 
-#include <deal.II/base/std_cxx1x/function.h>
+#include <deal.II/base/std_cxx11/function.h>
 #include <deal.II/base/logstream.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/dofs/dof_tools.h>
@@ -99,9 +99,9 @@ test_mesh(MGDoFHandler<dim> &mgdofs)
   MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, EmptyInfoBox>
   (dofs.begin_active(), dofs.end(),
    dof_info, info_box,
-   std_cxx1x::bind (&Local<dim>::cell, local, std_cxx1x::_1, std_cxx1x::_2),
-   std_cxx1x::bind (&Local<dim>::bdry, local, std_cxx1x::_1, std_cxx1x::_2),
-   std_cxx1x::bind (&Local<dim>::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4),
+   std_cxx11::bind (&Local<dim>::cell, local, std_cxx11::_1, std_cxx11::_2),
+   std_cxx11::bind (&Local<dim>::bdry, local, std_cxx11::_1, std_cxx11::_2),
+   std_cxx11::bind (&Local<dim>::face, local, std_cxx11::_1, std_cxx11::_2, std_cxx11::_3, std_cxx11::_4),
    assembler, true);
 
   deallog << "  Results";
@@ -114,9 +114,9 @@ test_mesh(MGDoFHandler<dim> &mgdofs)
   MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, EmptyInfoBox>
   (mgdofs.begin(), mgdofs.end(),
    mg_dof_info, info_box,
-   std_cxx1x::bind (&Local<dim>::cell, local, std_cxx1x::_1, std_cxx1x::_2),
-   std_cxx1x::bind (&Local<dim>::bdry, local, std_cxx1x::_1, std_cxx1x::_2),
-   std_cxx1x::bind (&Local<dim>::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4),
+   std_cxx11::bind (&Local<dim>::cell, local, std_cxx11::_1, std_cxx11::_2),
+   std_cxx11::bind (&Local<dim>::bdry, local, std_cxx11::_1, std_cxx11::_2),
+   std_cxx11::bind (&Local<dim>::face, local, std_cxx11::_1, std_cxx11::_2, std_cxx11::_3, std_cxx11::_4),
    assembler, true);
 
   deallog << "MGResults";

diff --git a/tests/integrators/mesh_worker_01.cc b/tests/integrators/mesh_worker_01.cc
index 8d5961a9fe0609ff8df4c3a3de7fbe4a9884242e..211995cdea0087af7ba217889c2f59fe0c0b3bbb 100644 (file)
--- a/tests/integrators/mesh_worker_01.cc
+++ b/tests/integrators/mesh_worker_01.cc
@@ -22,7 +22,7 @@
 #include <deal.II/meshworker/assembler.h>
 #include <deal.II/meshworker/loop.h>
 
-#include <deal.II/base/std_cxx1x/function.h>
+#include <deal.II/base/std_cxx11/function.h>
 #include <deal.II/base/logstream.h>
 #include <deal.II/lac/sparsity_pattern.h>
 #include <deal.II/lac/sparse_matrix.h>
@@ -149,9 +149,9 @@ test_simple(MGDoFHandler<dim> &mgdofs)
   MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, MeshWorker::IntegrationInfoBox<dim> >
   (dofs.begin_active(), dofs.end(),
    dof_info, info_box,
-   std_cxx1x::bind (&Local<dim>::cell, local, std_cxx1x::_1, std_cxx1x::_2),
-   std_cxx1x::bind (&Local<dim>::bdry, local, std_cxx1x::_1, std_cxx1x::_2),
-   std_cxx1x::bind (&Local<dim>::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4),
+   std_cxx11::bind (&Local<dim>::cell, local, std_cxx11::_1, std_cxx11::_2),
+   std_cxx11::bind (&Local<dim>::bdry, local, std_cxx11::_1, std_cxx11::_2),
+   std_cxx11::bind (&Local<dim>::face, local, std_cxx11::_1, std_cxx11::_2, std_cxx11::_3, std_cxx11::_4),
    assembler, true);
 
   for (unsigned int i=0; i<v.size(); ++i)
@@ -203,9 +203,9 @@ int main ()
   deallog.attach(logfile);
   deallog.depth_console (0);
 
-  std::vector<std_cxx1x::shared_ptr<FiniteElement<2> > > fe2;
-  fe2.push_back(std_cxx1x::shared_ptr<FiniteElement<2> >(new  FE_DGP<2>(1)));
-  fe2.push_back(std_cxx1x::shared_ptr<FiniteElement<2> >(new  FE_Q<2>(1)));
+  std::vector<std_cxx11::shared_ptr<FiniteElement<2> > > fe2;
+  fe2.push_back(std_cxx11::shared_ptr<FiniteElement<2> >(new  FE_DGP<2>(1)));
+  fe2.push_back(std_cxx11::shared_ptr<FiniteElement<2> >(new  FE_Q<2>(1)));
 
   for (unsigned int i=0; i<fe2.size(); ++i)
     test(*fe2[i]);

diff --git a/tests/integrators/mesh_worker_02.cc b/tests/integrators/mesh_worker_02.cc
index fc5472622893c2823e9e222930cc30d8435c2522..4334ec86f8544bbd55438ea89cfabd284391f500 100644 (file)
--- a/tests/integrators/mesh_worker_02.cc
+++ b/tests/integrators/mesh_worker_02.cc
@@ -297,9 +297,9 @@ int main ()
   deallog.attach(logfile);
   deallog.depth_console (0);
 
-  std::vector<std_cxx1x::shared_ptr<FiniteElement<2> > > fe2;
-  fe2.push_back(std_cxx1x::shared_ptr<FiniteElement<2> >(new  FE_DGP<2>(1)));
-//  fe2.push_back(std_cxx1x::shared_ptr<FiniteElement<2> >(new  FE_Q<2>(1)));
+  std::vector<std_cxx11::shared_ptr<FiniteElement<2> > > fe2;
+  fe2.push_back(std_cxx11::shared_ptr<FiniteElement<2> >(new  FE_DGP<2>(1)));
+//  fe2.push_back(std_cxx11::shared_ptr<FiniteElement<2> >(new  FE_Q<2>(1)));
 
   for (unsigned int i=0; i<fe2.size(); ++i)
     test(*fe2[i]);

diff --git a/tests/integrators/mesh_worker_03.cc b/tests/integrators/mesh_worker_03.cc
index 84be179ccf3d44452658e65c7cfa44b8c49d8ebd..013bde97bcb509869855eb558275e62f0cedfe3e 100644 (file)
--- a/tests/integrators/mesh_worker_03.cc
+++ b/tests/integrators/mesh_worker_03.cc
@@ -315,13 +315,13 @@ int main ()
   FE_DGP<2> dgp1(1);
   FE_Q<2> q1(1);
 
-  std::vector<std_cxx1x::shared_ptr<FiniteElement<2> > > fe2;
-  fe2.push_back(std_cxx1x::shared_ptr<FiniteElement<2> >(new FE_DGP<2>(0)));
-  fe2.push_back(std_cxx1x::shared_ptr<FiniteElement<2> >(new FESystem<2>(dgp0,3)));
-  fe2.push_back(std_cxx1x::shared_ptr<FiniteElement<2> >(new FESystem<2>(dgp1,2)));
-  fe2.push_back(std_cxx1x::shared_ptr<FiniteElement<2> >(new FESystem<2>(q1,2)));
-  fe2.push_back(std_cxx1x::shared_ptr<FiniteElement<2> >(new FESystem<2>(dgp0,1,q1,1)));
-//  fe2.push_back(std_cxx1x::shared_ptr<FiniteElement<2> >(new  FE_Q<2>(1)));
+  std::vector<std_cxx11::shared_ptr<FiniteElement<2> > > fe2;
+  fe2.push_back(std_cxx11::shared_ptr<FiniteElement<2> >(new FE_DGP<2>(0)));
+  fe2.push_back(std_cxx11::shared_ptr<FiniteElement<2> >(new FESystem<2>(dgp0,3)));
+  fe2.push_back(std_cxx11::shared_ptr<FiniteElement<2> >(new FESystem<2>(dgp1,2)));
+  fe2.push_back(std_cxx11::shared_ptr<FiniteElement<2> >(new FESystem<2>(q1,2)));
+  fe2.push_back(std_cxx11::shared_ptr<FiniteElement<2> >(new FESystem<2>(dgp0,1,q1,1)));
+//  fe2.push_back(std_cxx11::shared_ptr<FiniteElement<2> >(new  FE_Q<2>(1)));
 
   for (unsigned int i=0; i<fe2.size(); ++i)
     test(*fe2[i]);

diff --git a/tests/integrators/mesh_worker_1d_dg.cc b/tests/integrators/mesh_worker_1d_dg.cc
index 4f620a4840dbe909f397ca74b125b848dbe2bfbb..604b6de30496ce5e9ea93f25f0c49fc8844b2f0e 100644 (file)
--- a/tests/integrators/mesh_worker_1d_dg.cc
+++ b/tests/integrators/mesh_worker_1d_dg.cc
@@ -21,7 +21,7 @@
 #include <deal.II/meshworker/assembler.h>
 #include <deal.II/meshworker/loop.h>
 
-#include <deal.II/base/std_cxx1x/function.h>
+#include <deal.II/base/std_cxx11/function.h>
 #include <deal.II/base/logstream.h>
 #include <deal.II/lac/sparsity_pattern.h>
 #include <deal.II/lac/sparse_matrix.h>
@@ -255,12 +255,12 @@ namespace Advection
     MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, MeshWorker::IntegrationInfoBox<dim> >
     (dof_handler.begin_active(), dof_handler.end(),
      dof_info, info_box,
-     std_cxx1x::bind(&AdvectionProblem<dim>::integrate_cell_term,
-                     this, std_cxx1x::_1, std_cxx1x::_2),
-     std_cxx1x::bind(&AdvectionProblem<dim>::integrate_boundary_term,
-                     this, std_cxx1x::_1, std_cxx1x::_2),
-     std_cxx1x::bind(&AdvectionProblem<dim>::integrate_face_term,
-                     this, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4),
+     std_cxx11::bind(&AdvectionProblem<dim>::integrate_cell_term,
+                     this, std_cxx11::_1, std_cxx11::_2),
+     std_cxx11::bind(&AdvectionProblem<dim>::integrate_boundary_term,
+                     this, std_cxx11::_1, std_cxx11::_2),
+     std_cxx11::bind(&AdvectionProblem<dim>::integrate_face_term,
+                     this, std_cxx11::_1, std_cxx11::_2, std_cxx11::_3, std_cxx11::_4),
      assembler, true);
 
   }//assemble_system

diff --git a/tests/integrators/mesh_worker_matrix_01.cc b/tests/integrators/mesh_worker_matrix_01.cc
index 004d6a3d4e095c5c0c50fa4bd0606d95223b052a..daf90dfffbe605beedf63cafb8f2c7aa46f8b15d 100644 (file)
--- a/tests/integrators/mesh_worker_matrix_01.cc
+++ b/tests/integrators/mesh_worker_matrix_01.cc
@@ -22,7 +22,7 @@
 #include <deal.II/meshworker/assembler.h>
 #include <deal.II/meshworker/loop.h>
 
-#include <deal.II/base/std_cxx1x/function.h>
+#include <deal.II/base/std_cxx11/function.h>
 #include <deal.II/base/logstream.h>
 #include <deal.II/lac/sparsity_pattern.h>
 #include <deal.II/lac/sparse_matrix.h>
@@ -154,9 +154,9 @@ test_simple(DoFHandler<dim> &dofs, bool faces)
   MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, MeshWorker::IntegrationInfoBox<dim> >
   (dofs.begin_active(), dofs.end(),
    dof_info, info_box,
-   std_cxx1x::bind (&Local<dim>::cell, local, std_cxx1x::_1, std_cxx1x::_2),
-   std_cxx1x::bind (&Local<dim>::bdry, local, std_cxx1x::_1, std_cxx1x::_2),
-   std_cxx1x::bind (&Local<dim>::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4),
+   std_cxx11::bind (&Local<dim>::cell, local, std_cxx11::_1, std_cxx11::_2),
+   std_cxx11::bind (&Local<dim>::bdry, local, std_cxx11::_1, std_cxx11::_2),
+   std_cxx11::bind (&Local<dim>::face, local, std_cxx11::_1, std_cxx11::_2, std_cxx11::_3, std_cxx11::_4),
    assembler, true);
 
   //matrix.print_formatted(deallog.get_file_stream(), 0, false, 4);

diff --git a/tests/matrix_free/estimate_condition_number_mass.cc b/tests/matrix_free/estimate_condition_number_mass.cc
index bea4f8ac5929f6cb27de624b2118967abb554523..ee59d906be81b50df5d6b213761fcd0388d0cc1b 100644 (file)
--- a/tests/matrix_free/estimate_condition_number_mass.cc
+++ b/tests/matrix_free/estimate_condition_number_mass.cc
@@ -78,7 +78,7 @@ public:
               const Vector<Number> &src) const
   {
     dst = 0;
-    const std_cxx1x::function<void(const MatrixFree<dim,Number> &,
+    const std_cxx11::function<void(const MatrixFree<dim,Number> &,
                                    Vector<Number> &,
                                    const Vector<Number> &,
                                    const std::pair<unsigned int,unsigned int> &)>

diff --git a/tests/matrix_free/matrix_vector_12.cc b/tests/matrix_free/matrix_vector_12.cc
index 0c497fe15bbfc39bb6781e47ba8b975c8aebe42a..7ee79f9282355f271474653808d716db3510f1ec 100644 (file)
--- a/tests/matrix_free/matrix_vector_12.cc
+++ b/tests/matrix_free/matrix_vector_12.cc
@@ -88,7 +88,7 @@ public:
   {
     for (unsigned int i=0; i<dst.size(); ++i)
       dst[i] = 0;
-    const std_cxx1x::function<void(const MatrixFree<dim,Number> &,
+    const std_cxx11::function<void(const MatrixFree<dim,Number> &,
                                    std::vector<parallel::distributed::Vector<Number> > &,
                                    const std::vector<parallel::distributed::Vector<Number> > &,
                                    const std::pair<unsigned int,unsigned int> &)>

diff --git a/tests/matrix_free/matrix_vector_13.cc b/tests/matrix_free/matrix_vector_13.cc
index c777c8c79cce67a6cb28ca4cbf1692cc4917961c..d37665213bc66e9489cbef4701ca01e29218163e 100644 (file)
--- a/tests/matrix_free/matrix_vector_13.cc
+++ b/tests/matrix_free/matrix_vector_13.cc
@@ -88,7 +88,7 @@ public:
               const parallel::distributed::BlockVector<Number> &src) const
   {
     dst = 0;
-    const std_cxx1x::function<void(const MatrixFree<dim,Number> &,
+    const std_cxx11::function<void(const MatrixFree<dim,Number> &,
                                    parallel::distributed::BlockVector<Number> &,
                                    const parallel::distributed::BlockVector<Number> &,
                                    const std::pair<unsigned int,unsigned int> &)>

diff --git a/tests/matrix_free/matrix_vector_mf.h b/tests/matrix_free/matrix_vector_mf.h
index 6b3fe20a0e53c77df57894b496a47f926bfc2dde..3969e7e288e9464ac1e39bb73e06c372c94438d6 100644 (file)
--- a/tests/matrix_free/matrix_vector_mf.h
+++ b/tests/matrix_free/matrix_vector_mf.h
@@ -61,7 +61,7 @@ public:
               const VECTOR &src) const
   {
     dst = 0;
-    const std_cxx1x::function<void(const MatrixFree<dim,typename VECTOR::value_type> &,
+    const std_cxx11::function<void(const MatrixFree<dim,typename VECTOR::value_type> &,
                                    VECTOR &,
                                    const VECTOR &,
                                    const std::pair<unsigned int,unsigned int> &)>

diff --git a/tests/mpi/crash_06.cc b/tests/mpi/crash_06.cc
index f6fcc5dd11a0bb7c7f7a116b8f83010f59966b71..e33212b09f62417bc4312b3de9cbc88e5e68de0a 100644 (file)
--- a/tests/mpi/crash_06.cc
+++ b/tests/mpi/crash_06.cc
@@ -76,14 +76,14 @@ void test(FiniteElement<dim> &fe)
 template <int dim>
 void testit()
 {
-  std::vector<std_cxx1x::shared_ptr<FiniteElement<dim> > > fes;
-  fes.push_back(std_cxx1x::shared_ptr<FiniteElement<dim> >(new FE_RaviartThomas<dim>(0)));
-  fes.push_back(std_cxx1x::shared_ptr<FiniteElement<dim> >(new FE_RaviartThomas<dim>(1)));
-  fes.push_back(std_cxx1x::shared_ptr<FiniteElement<dim> >(new FE_Nedelec<dim>(0)));
-  fes.push_back(std_cxx1x::shared_ptr<FiniteElement<dim> >(new FE_Nedelec<dim>(1)));
-  fes.push_back(std_cxx1x::shared_ptr<FiniteElement<dim> >(new FE_Q<dim>(3)));
-  fes.push_back(std_cxx1x::shared_ptr<FiniteElement<dim> >(new FE_DGQ<dim>(2)));
-  fes.push_back(std_cxx1x::shared_ptr<FiniteElement<dim> >(new FE_Q_DG0<dim>(2)));
+  std::vector<std_cxx11::shared_ptr<FiniteElement<dim> > > fes;
+  fes.push_back(std_cxx11::shared_ptr<FiniteElement<dim> >(new FE_RaviartThomas<dim>(0)));
+  fes.push_back(std_cxx11::shared_ptr<FiniteElement<dim> >(new FE_RaviartThomas<dim>(1)));
+  fes.push_back(std_cxx11::shared_ptr<FiniteElement<dim> >(new FE_Nedelec<dim>(0)));
+  fes.push_back(std_cxx11::shared_ptr<FiniteElement<dim> >(new FE_Nedelec<dim>(1)));
+  fes.push_back(std_cxx11::shared_ptr<FiniteElement<dim> >(new FE_Q<dim>(3)));
+  fes.push_back(std_cxx11::shared_ptr<FiniteElement<dim> >(new FE_DGQ<dim>(2)));
+  fes.push_back(std_cxx11::shared_ptr<FiniteElement<dim> >(new FE_Q_DG0<dim>(2)));
 
   for (unsigned int i=0;i<fes.size();++i)
     {

diff --git a/tests/mpi/mesh_worker_01.cc b/tests/mpi/mesh_worker_01.cc
index b9ba6e898f4cdc3a58b4cfd4097be27df5e436f7..c1e96e7933c523a5f133d47796f651bab8cc75bd 100644 (file)
--- a/tests/mpi/mesh_worker_01.cc
+++ b/tests/mpi/mesh_worker_01.cc
@@ -103,9 +103,9 @@ test_simple(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 //                typename identity<ITERATOR>::type end,
 //                DOFINFO &dinfo,
 //                INFOBOX &info,
-//                const std_cxx1x::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &cell_worker,
-//                const std_cxx1x::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &boundary_worker,
-//                const std_cxx1x::function<void (DOFINFO &, DOFINFO &,
+//                const std_cxx11::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &cell_worker,
+//                const std_cxx11::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &boundary_worker,
+//                const std_cxx11::function<void (DOFINFO &, DOFINFO &,
 //                                                typename INFOBOX::CellInfo &,
 //                                                typename INFOBOX::CellInfo &)> &face_worker,
 //                ASSEMBLER &assembler,
@@ -123,9 +123,9 @@ test_simple(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 //  MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, MeshWorker::IntegrationInfoBox<dim> >
 //    (dofs.begin_active(), dofs.end(),
 //   dof_info, info_box,
-//       std_cxx1x::bind (&Integrator<dim>::cell, local, std_cxx1x::_1, std_cxx1x::_2),
-//   std_cxx1x::bind (&Integrator<dim>::bdry, local, std_cxx1x::_1, std_cxx1x::_2),
-//   std_cxx1x::bind (&Integrator<dim>::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4),
+//       std_cxx11::bind (&Integrator<dim>::cell, local, std_cxx11::_1, std_cxx11::_2),
+//   std_cxx11::bind (&Integrator<dim>::bdry, local, std_cxx11::_1, std_cxx11::_2),
+//   std_cxx11::bind (&Integrator<dim>::face, local, std_cxx11::_1, std_cxx11::_2, std_cxx11::_3, std_cxx11::_4),
 //     local,
 //     lctrl);
 }

diff --git a/tests/mpi/mesh_worker_02.cc b/tests/mpi/mesh_worker_02.cc
index f4ceb8c2607b544df09e583b4e97af470da31812..f958d239a932c128745dfeadfdcec9c57c782200 100644 (file)
--- a/tests/mpi/mesh_worker_02.cc
+++ b/tests/mpi/mesh_worker_02.cc
@@ -102,9 +102,9 @@ test_simple(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 //                typename identity<ITERATOR>::type end,
 //                DOFINFO &dinfo,
 //                INFOBOX &info,
-//                const std_cxx1x::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &cell_worker,
-//                const std_cxx1x::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &boundary_worker,
-//                const std_cxx1x::function<void (DOFINFO &, DOFINFO &,
+//                const std_cxx11::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &cell_worker,
+//                const std_cxx11::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &boundary_worker,
+//                const std_cxx11::function<void (DOFINFO &, DOFINFO &,
 //                                                typename INFOBOX::CellInfo &,
 //                                                typename INFOBOX::CellInfo &)> &face_worker,
 //                ASSEMBLER &assembler,
@@ -122,9 +122,9 @@ test_simple(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 //  MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, MeshWorker::IntegrationInfoBox<dim> >
 //    (dofs.begin_active(), dofs.end(),
 //   dof_info, info_box,
-//       std_cxx1x::bind (&Integrator<dim>::cell, local, std_cxx1x::_1, std_cxx1x::_2),
-//   std_cxx1x::bind (&Integrator<dim>::bdry, local, std_cxx1x::_1, std_cxx1x::_2),
-//   std_cxx1x::bind (&Integrator<dim>::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4),
+//       std_cxx11::bind (&Integrator<dim>::cell, local, std_cxx11::_1, std_cxx11::_2),
+//   std_cxx11::bind (&Integrator<dim>::bdry, local, std_cxx11::_1, std_cxx11::_2),
+//   std_cxx11::bind (&Integrator<dim>::face, local, std_cxx11::_1, std_cxx11::_2, std_cxx11::_3, std_cxx11::_4),
 //     local,
 //     lctrl);
 }

diff --git a/tests/mpi/mesh_worker_03.cc b/tests/mpi/mesh_worker_03.cc
index c895872ab5187a49d65b4adc5137c408fd51a607..3368d0bbf3f5b18451bb30e89441dc7bcb9ae25c 100644 (file)
--- a/tests/mpi/mesh_worker_03.cc
+++ b/tests/mpi/mesh_worker_03.cc
@@ -102,9 +102,9 @@ test_simple(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 //                typename identity<ITERATOR>::type end,
 //                DOFINFO &dinfo,
 //                INFOBOX &info,
-//                const std_cxx1x::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &cell_worker,
-//                const std_cxx1x::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &boundary_worker,
-//                const std_cxx1x::function<void (DOFINFO &, DOFINFO &,
+//                const std_cxx11::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &cell_worker,
+//                const std_cxx11::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &boundary_worker,
+//                const std_cxx11::function<void (DOFINFO &, DOFINFO &,
 //                                                typename INFOBOX::CellInfo &,
 //                                                typename INFOBOX::CellInfo &)> &face_worker,
 //                ASSEMBLER &assembler,
@@ -122,9 +122,9 @@ test_simple(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 //  MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, MeshWorker::IntegrationInfoBox<dim> >
 //    (dofs.begin_active(), dofs.end(),
 //   dof_info, info_box,
-//       std_cxx1x::bind (&Integrator<dim>::cell, local, std_cxx1x::_1, std_cxx1x::_2),
-//   std_cxx1x::bind (&Integrator<dim>::bdry, local, std_cxx1x::_1, std_cxx1x::_2),
-//   std_cxx1x::bind (&Integrator<dim>::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4),
+//       std_cxx11::bind (&Integrator<dim>::cell, local, std_cxx11::_1, std_cxx11::_2),
+//   std_cxx11::bind (&Integrator<dim>::bdry, local, std_cxx11::_1, std_cxx11::_2),
+//   std_cxx11::bind (&Integrator<dim>::face, local, std_cxx11::_1, std_cxx11::_2, std_cxx11::_3, std_cxx11::_4),
 //     local,
 //     lctrl);
 }

diff --git a/tests/mpi/mesh_worker_04.cc b/tests/mpi/mesh_worker_04.cc
index ecac402bf0b18283d41c73298b09ce7a477e0b15..21df311214cf9d12f5f091a35f4a44d4b08e2afe 100644 (file)
--- a/tests/mpi/mesh_worker_04.cc
+++ b/tests/mpi/mesh_worker_04.cc
@@ -103,9 +103,9 @@ test_simple(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 //                typename identity<ITERATOR>::type end,
 //                DOFINFO &dinfo,
 //                INFOBOX &info,
-//                const std_cxx1x::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &cell_worker,
-//                const std_cxx1x::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &boundary_worker,
-//                const std_cxx1x::function<void (DOFINFO &, DOFINFO &,
+//                const std_cxx11::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &cell_worker,
+//                const std_cxx11::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &boundary_worker,
+//                const std_cxx11::function<void (DOFINFO &, DOFINFO &,
 //                                                typename INFOBOX::CellInfo &,
 //                                                typename INFOBOX::CellInfo &)> &face_worker,
 //                ASSEMBLER &assembler,
@@ -123,9 +123,9 @@ test_simple(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 //  MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, MeshWorker::IntegrationInfoBox<dim> >
 //    (dofs.begin_active(), dofs.end(),
 //   dof_info, info_box,
-//       std_cxx1x::bind (&Integrator<dim>::cell, local, std_cxx1x::_1, std_cxx1x::_2),
-//   std_cxx1x::bind (&Integrator<dim>::bdry, local, std_cxx1x::_1, std_cxx1x::_2),
-//   std_cxx1x::bind (&Integrator<dim>::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4),
+//       std_cxx11::bind (&Integrator<dim>::cell, local, std_cxx11::_1, std_cxx11::_2),
+//   std_cxx11::bind (&Integrator<dim>::bdry, local, std_cxx11::_1, std_cxx11::_2),
+//   std_cxx11::bind (&Integrator<dim>::face, local, std_cxx11::_1, std_cxx11::_2, std_cxx11::_3, std_cxx11::_4),
 //     local,
 //     lctrl);
 }

diff --git a/tests/mpi/mesh_worker_05.cc b/tests/mpi/mesh_worker_05.cc
index 3387e1abc54cd3397fc997dba3cda9f09429936b..07e85ee08d6f9bedf9f74ede8c01ad32287710e7 100644 (file)
--- a/tests/mpi/mesh_worker_05.cc
+++ b/tests/mpi/mesh_worker_05.cc
@@ -104,9 +104,9 @@ test_simple(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 //                typename identity<ITERATOR>::type end,
 //                DOFINFO &dinfo,
 //                INFOBOX &info,
-//                const std_cxx1x::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &cell_worker,
-//                const std_cxx1x::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &boundary_worker,
-//                const std_cxx1x::function<void (DOFINFO &, DOFINFO &,
+//                const std_cxx11::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &cell_worker,
+//                const std_cxx11::function<void (DOFINFO &, typename INFOBOX::CellInfo &)> &boundary_worker,
+//                const std_cxx11::function<void (DOFINFO &, DOFINFO &,
 //                                                typename INFOBOX::CellInfo &,
 //                                                typename INFOBOX::CellInfo &)> &face_worker,
 //                ASSEMBLER &assembler,
@@ -124,9 +124,9 @@ test_simple(DoFHandler<dim> &dofs, MeshWorker::LoopControl &lctrl)
 //  MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, MeshWorker::IntegrationInfoBox<dim> >
 //    (dofs.begin_active(), dofs.end(),
 //   dof_info, info_box,
-//       std_cxx1x::bind (&Integrator<dim>::cell, local, std_cxx1x::_1, std_cxx1x::_2),
-//   std_cxx1x::bind (&Integrator<dim>::bdry, local, std_cxx1x::_1, std_cxx1x::_2),
-//   std_cxx1x::bind (&Integrator<dim>::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4),
+//       std_cxx11::bind (&Integrator<dim>::cell, local, std_cxx11::_1, std_cxx11::_2),
+//   std_cxx11::bind (&Integrator<dim>::bdry, local, std_cxx11::_1, std_cxx11::_2),
+//   std_cxx11::bind (&Integrator<dim>::face, local, std_cxx11::_1, std_cxx11::_2, std_cxx11::_3, std_cxx11::_4),
 //     local,
 //     lctrl);
 }

diff --git a/tests/mpi/mesh_worker_matrix_01.cc b/tests/mpi/mesh_worker_matrix_01.cc
index ae8439f3e7e6a973af2b0fa6cee981c8f1ea4787..63972311c1beff04c89b889369821f51b468224b 100644 (file)
--- a/tests/mpi/mesh_worker_matrix_01.cc
+++ b/tests/mpi/mesh_worker_matrix_01.cc
@@ -24,7 +24,7 @@
 #include <deal.II/meshworker/assembler.h>
 #include <deal.II/meshworker/loop.h>
 
-#include <deal.II/base/std_cxx1x/function.h>
+#include <deal.II/base/std_cxx11/function.h>
 #include <deal.II/base/logstream.h>
 #include <deal.II/lac/sparsity_pattern.h>
 #include <deal.II/lac/sparse_matrix.h>
@@ -159,9 +159,9 @@ test_simple(DoFHandler<dim> &dofs, bool faces)
   MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, MeshWorker::IntegrationInfoBox<dim> >
   (cell, end,
    dof_info, info_box,
-   std_cxx1x::bind (&Local<dim>::cell, local, std_cxx1x::_1, std_cxx1x::_2),
-   std_cxx1x::bind (&Local<dim>::bdry, local, std_cxx1x::_1, std_cxx1x::_2),
-   std_cxx1x::bind (&Local<dim>::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4),
+   std_cxx11::bind (&Local<dim>::cell, local, std_cxx11::_1, std_cxx11::_2),
+   std_cxx11::bind (&Local<dim>::bdry, local, std_cxx11::_1, std_cxx11::_2),
+   std_cxx11::bind (&Local<dim>::face, local, std_cxx11::_1, std_cxx11::_2, std_cxx11::_3, std_cxx11::_4),
    assembler, true);
 
   matrix.compress(VectorOperation::add);

diff --git a/tests/multigrid/mg_renumbered_02.cc b/tests/multigrid/mg_renumbered_02.cc
index 2a95e8ab481e212d982edb8d74cb588b007c0e3e..cf1aab53961f124de969bba584399cc892f4ceef 100644 (file)
--- a/tests/multigrid/mg_renumbered_02.cc
+++ b/tests/multigrid/mg_renumbered_02.cc
@@ -62,7 +62,7 @@
 
 #include <fstream>
 #include <sstream>
-#include <deal.II/base/std_cxx1x/bind.h>
+#include <deal.II/base/std_cxx11/bind.h>
 
 using namespace dealii;
 
@@ -265,7 +265,7 @@ LaplaceProblem<dim>::output_gpl(const MGDoFHandler<dim> &dof,
       MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, MeshWorker::IntegrationInfoBox<dim> > (
         dof.begin(l), dof.end(l),
         dof_info, info_box,
-        std_cxx1x::bind(&OutputCreator<dim>::cell, &matrix_integrator, std_cxx1x::_1, std_cxx1x::_2),
+        std_cxx11::bind(&OutputCreator<dim>::cell, &matrix_integrator, std_cxx11::_1, std_cxx11::_2),
         0,
         0,
         assembler);

diff --git a/tests/multigrid/mg_renumbered_03.cc b/tests/multigrid/mg_renumbered_03.cc
index 007066aecbe1fcda56b2815d44caee5e09cc9bb3..0879bfc4c3b86d0d2a4f731a4ad5bd59070fa934 100644 (file)
--- a/tests/multigrid/mg_renumbered_03.cc
+++ b/tests/multigrid/mg_renumbered_03.cc
@@ -62,7 +62,7 @@
 
 #include <fstream>
 #include <sstream>
-#include <deal.II/base/std_cxx1x/bind.h>
+#include <deal.II/base/std_cxx11/bind.h>
 
 using namespace dealii;
 
@@ -312,7 +312,7 @@ LaplaceProblem<dim>::output_gpl(const MGDoFHandler<dim> &dof,
       MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, MeshWorker::IntegrationInfoBox<dim> > (
         dof.begin(l), dof.end(l),
         dof_info, info_box,
-        std_cxx1x::bind(&OutputCreator<dim>::cell, &matrix_integrator, std_cxx1x::_1, std_cxx1x::_2),
+        std_cxx11::bind(&OutputCreator<dim>::cell, &matrix_integrator, std_cxx11::_1, std_cxx11::_2),
         0,
         0,
         assembler);

diff --git a/tests/quick_tests/tbb.cc b/tests/quick_tests/tbb.cc
index 31da6440d783019bc0edbc4d419f7497f3dc06db..27fe3426ca59a2eae17fcb91846396854d805a2d 100644 (file)
--- a/tests/quick_tests/tbb.cc
+++ b/tests/quick_tests/tbb.cc
@@ -69,9 +69,9 @@ void test2()
   WorkStream::run(v.begin(),
                  v.end(),
                  &assemble,
-                 std_cxx1x::bind(&copy,
-                                 std_cxx1x::ref(result),
-                                 std_cxx1x::_1),
+                 std_cxx11::bind(&copy,
+                                 std_cxx11::ref(result),
+                                 std_cxx11::_1),
                  scratch_data(), copy_data());
   std::cout << "result: " << result << std::endl;
 

diff --git a/tests/trilinos/assemble_matrix_parallel_01.cc b/tests/trilinos/assemble_matrix_parallel_01.cc
index ca074fec83880c9878ed87c4a75ed744acff2a72..cb29a35ebb619e7e62adfc6ad2d1cafd5ba89e49 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_01.cc
+++ b/tests/trilinos/assemble_matrix_parallel_01.cc
@@ -255,9 +255,9 @@ void LaplaceProblem<dim>::setup_system ()
   constraints.close ();
 
   graph = GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(),
-                                             static_cast<std_cxx1x::function<std::vector<types::global_dof_index>
+                                             static_cast<std_cxx11::function<std::vector<types::global_dof_index>
                                              (typename hp::DoFHandler<dim>::active_cell_iterator const &)> >
-                                             (std_cxx1x::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx1x::_1)));
+                                             (std_cxx11::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx11::_1)));
 
 
   CompressedSimpleSparsityPattern csp (dof_handler.n_dofs(),
@@ -356,16 +356,16 @@ void LaplaceProblem<dim>::assemble_test ()
 
   WorkStream::
     run (graph,
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           local_assemble,
                           this,
-                          std_cxx1x::_1,
-                          std_cxx1x::_2,
-                          std_cxx1x::_3),
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+                          std_cxx11::_1,
+                          std_cxx11::_2,
+                          std_cxx11::_3),
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           copy_local_to_global,
                           this,
-                          std_cxx1x::_1),
+                          std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe_collection, quadrature_collection),
          Assembly::Copy::Data (),
          2*multithread_info.n_threads(),

diff --git a/tests/trilinos/assemble_matrix_parallel_02.cc b/tests/trilinos/assemble_matrix_parallel_02.cc
index 96cabf815a29b23aa75a2939a267d1077025d17a..79716913071e0479293647ba7e7c63f40c7fa035 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_02.cc
+++ b/tests/trilinos/assemble_matrix_parallel_02.cc
@@ -247,9 +247,9 @@ void LaplaceProblem<dim>::setup_system ()
   CellFilter begin(IteratorFilters::LocallyOwnedCell(),dof_handler.begin_active());
   CellFilter end(IteratorFilters::LocallyOwnedCell(),dof_handler.end());
   graph = GraphColoring::make_graph_coloring(begin,end,
-        static_cast<std_cxx1x::function<std::vector<types::global_dof_index>
+        static_cast<std_cxx11::function<std::vector<types::global_dof_index>
         (FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const &)> >
-        (std_cxx1x::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx1x::_1)));
+        (std_cxx11::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx11::_1)));
 
   IndexSet locally_owned = dof_handler.locally_owned_dofs();
   {
@@ -366,16 +366,16 @@ void LaplaceProblem<dim>::assemble_test ()
 
   WorkStream::
     run (graph,
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           local_assemble,
                           this,
-                          std_cxx1x::_1,
-                          std_cxx1x::_2,
-                          std_cxx1x::_3),
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+                          std_cxx11::_1,
+                          std_cxx11::_2,
+                          std_cxx11::_3),
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           copy_local_to_global,
                           this,
-                          std_cxx1x::_1),
+                          std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe, quadrature),
          Assembly::Copy::Data (false),
          2*multithread_info.n_threads(),

diff --git a/tests/trilinos/assemble_matrix_parallel_03.cc b/tests/trilinos/assemble_matrix_parallel_03.cc
index ce114164bd66f8918d86a196e6cfcf2c23f8a9c1..ed6548e1fa1fe59ebd4738e00ef9760c77cae653 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_03.cc
+++ b/tests/trilinos/assemble_matrix_parallel_03.cc
@@ -248,9 +248,9 @@ void LaplaceProblem<dim>::setup_system ()
   CellFilter begin(IteratorFilters::LocallyOwnedCell(),dof_handler.begin_active());
   CellFilter end(IteratorFilters::LocallyOwnedCell(),dof_handler.end());
   graph = GraphColoring::make_graph_coloring(begin,end,
-        static_cast<std_cxx1x::function<std::vector<types::global_dof_index>
+        static_cast<std_cxx11::function<std::vector<types::global_dof_index>
         (FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const &)> >
-        (std_cxx1x::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx1x::_1)));
+        (std_cxx11::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx11::_1)));
 
   IndexSet locally_owned = dof_handler.locally_owned_dofs();
   {
@@ -367,16 +367,16 @@ void LaplaceProblem<dim>::assemble_test ()
 
   WorkStream::
     run (graph,
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           local_assemble,
                           this,
-                          std_cxx1x::_1,
-                          std_cxx1x::_2,
-                          std_cxx1x::_3),
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+                          std_cxx11::_1,
+                          std_cxx11::_2,
+                          std_cxx11::_3),
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           copy_local_to_global,
                           this,
-                          std_cxx1x::_1),
+                          std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe, quadrature),
          Assembly::Copy::Data (false),
          2*multithread_info.n_threads(),

diff --git a/tests/trilinos/assemble_matrix_parallel_04.cc b/tests/trilinos/assemble_matrix_parallel_04.cc
index 970137a13311fac71687cf5fa6096be7a4b79a79..167a0dd4d435a302f90582a0d01852e96cd79feb 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_04.cc
+++ b/tests/trilinos/assemble_matrix_parallel_04.cc
@@ -252,9 +252,9 @@ void LaplaceProblem<dim>::setup_system ()
   CellFilter begin(IteratorFilters::LocallyOwnedCell(),dof_handler.begin_active());
   CellFilter end(IteratorFilters::LocallyOwnedCell(),dof_handler.end());
   graph = GraphColoring::make_graph_coloring(begin,end,
-        static_cast<std_cxx1x::function<std::vector<types::global_dof_index>
+        static_cast<std_cxx11::function<std::vector<types::global_dof_index>
         (FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const &)> >
-        (std_cxx1x::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx1x::_1)));
+        (std_cxx11::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx11::_1)));
 
   TrilinosWrappers::BlockSparsityPattern csp(2,2);
   std::vector<IndexSet> locally_owned(2), relevant_set(2);
@@ -382,16 +382,16 @@ void LaplaceProblem<dim>::assemble_test ()
 
   WorkStream::
     run (graph,
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           local_assemble,
                           this,
-                          std_cxx1x::_1,
-                          std_cxx1x::_2,
-                          std_cxx1x::_3),
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+                          std_cxx11::_1,
+                          std_cxx11::_2,
+                          std_cxx11::_3),
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           copy_local_to_global,
                           this,
-                          std_cxx1x::_1),
+                          std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe, quadrature),
          Assembly::Copy::Data (false),
          2*multithread_info.n_threads(),

diff --git a/tests/trilinos/assemble_matrix_parallel_05.cc b/tests/trilinos/assemble_matrix_parallel_05.cc
index f39a906e1a37db89b37466b73115a3f54053c4e3..a1cc4b2e260252c4b37ef7d2023f75f726bb8ce1 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_05.cc
+++ b/tests/trilinos/assemble_matrix_parallel_05.cc
@@ -250,9 +250,9 @@ void LaplaceProblem<dim>::setup_system ()
   CellFilter begin(IteratorFilters::LocallyOwnedCell(),dof_handler.begin_active());
   CellFilter end(IteratorFilters::LocallyOwnedCell(),dof_handler.end());
   graph = GraphColoring::make_graph_coloring(begin,end,
-        static_cast<std_cxx1x::function<std::vector<types::global_dof_index>
+        static_cast<std_cxx11::function<std::vector<types::global_dof_index>
         (FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const &)> >
-        (std_cxx1x::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx1x::_1)));
+        (std_cxx11::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx11::_1)));
 
   IndexSet locally_owned = dof_handler.locally_owned_dofs();
   {
@@ -368,16 +368,16 @@ void LaplaceProblem<dim>::assemble_test ()
 
   WorkStream::
     run (graph,
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           local_assemble,
                           this,
-                          std_cxx1x::_1,
-                          std_cxx1x::_2,
-                          std_cxx1x::_3),
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+                          std_cxx11::_1,
+                          std_cxx11::_2,
+                          std_cxx11::_3),
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           copy_local_to_global,
                           this,
-                          std_cxx1x::_1),
+                          std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe, quadrature),
          Assembly::Copy::Data (false),
          2*multithread_info.n_threads(),

diff --git a/tests/trilinos/assemble_matrix_parallel_06.cc b/tests/trilinos/assemble_matrix_parallel_06.cc
index 592f21a821dc4c1d0264f31b6fecdac346974053..d84daf38c34ebce3ceb3b5a17fa1aa2f2c3be742 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_06.cc
+++ b/tests/trilinos/assemble_matrix_parallel_06.cc
@@ -254,9 +254,9 @@ void LaplaceProblem<dim>::setup_system ()
   CellFilter begin(IteratorFilters::LocallyOwnedCell(),dof_handler.begin_active());
   CellFilter end(IteratorFilters::LocallyOwnedCell(),dof_handler.end());
   graph = GraphColoring::make_graph_coloring(begin,end,
-        static_cast<std_cxx1x::function<std::vector<types::global_dof_index>
+        static_cast<std_cxx11::function<std::vector<types::global_dof_index>
         (FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const &)> >
-        (std_cxx1x::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx1x::_1)));
+        (std_cxx11::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx11::_1)));
 
   TrilinosWrappers::BlockSparsityPattern csp(2,2);
   std::vector<IndexSet> locally_owned(2), relevant_set(2);
@@ -383,16 +383,16 @@ void LaplaceProblem<dim>::assemble_test ()
 
   WorkStream::
     run (graph,
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           local_assemble,
                           this,
-                          std_cxx1x::_1,
-                          std_cxx1x::_2,
-                          std_cxx1x::_3),
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+                          std_cxx11::_1,
+                          std_cxx11::_2,
+                          std_cxx11::_3),
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           copy_local_to_global,
                           this,
-                          std_cxx1x::_1),
+                          std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe, quadrature),
          Assembly::Copy::Data (false),
          2*multithread_info.n_threads(),

diff --git a/tests/trilinos/assemble_matrix_parallel_07.cc b/tests/trilinos/assemble_matrix_parallel_07.cc
index b798296cdfb4984e2219f1905c7c763b8f60f0bc..568d729cb5b07316f7fec05c42a88f7d70dc0921 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_07.cc
+++ b/tests/trilinos/assemble_matrix_parallel_07.cc
@@ -248,9 +248,9 @@ void LaplaceProblem<dim>::setup_system ()
   CellFilter begin(IteratorFilters::LocallyOwnedCell(),dof_handler.begin_active());
   CellFilter end(IteratorFilters::LocallyOwnedCell(),dof_handler.end());
   graph = GraphColoring::make_graph_coloring(begin,end,
-        static_cast<std_cxx1x::function<std::vector<types::global_dof_index>
+        static_cast<std_cxx11::function<std::vector<types::global_dof_index>
         (FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const &)> >
-        (std_cxx1x::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx1x::_1)));
+        (std_cxx11::bind(&LaplaceProblem<dim>::get_conflict_indices, this,std_cxx11::_1)));
 
   IndexSet locally_owned = dof_handler.locally_owned_dofs();
   {
@@ -374,16 +374,16 @@ void LaplaceProblem<dim>::assemble_test ()
 
   WorkStream::
     run (graph,
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           local_assemble,
                           this,
-                          std_cxx1x::_1,
-                          std_cxx1x::_2,
-                          std_cxx1x::_3),
-         std_cxx1x::bind (&LaplaceProblem<dim>::
+                          std_cxx11::_1,
+                          std_cxx11::_2,
+                          std_cxx11::_3),
+         std_cxx11::bind (&LaplaceProblem<dim>::
                           copy_local_to_global,
                           this,
-                          std_cxx1x::_1),
+                          std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe, quadrature),
          Assembly::Copy::Data (false),
          2*multithread_info.n_threads(),