From: Wolfgang Bangerth Date: Sun, 24 Aug 2014 16:48:45 +0000 (-0500) Subject: Replace all occurrences of std_cxx1x by std_cxx11 also in tests/. X-Git-Tag: v8.2.0-rc1~171^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1692622da5cc8eeb25b251e60aea3425b1b0fe58;p=dealii.git 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 dcf4cde8b7..fd8c9995ba 100644 --- 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 4265f40dc5..f476115036 100644 --- a/tests/base/data_out_base.cc +++ b/tests/base/data_out_base.cc @@ -48,7 +48,7 @@ write_patches(const std::vector > &patches, DataOutBase::VtkFlags vtkflags; DataOutBase::Deal_II_IntermediateFlags deal_II_intermediateflags; - std::vector > vectors; + std::vector > 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 14c0e7a478..652a927c7f 100644 --- 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 > vectors; + std::vector > vectors; DataOutBase::write_dx(patches, names, vectors, flags, out); } @@ -69,7 +69,7 @@ void check_cont(unsigned int ncells, std::vector names(1); names[0] = "CutOff"; - std::vector > vectors; + std::vector > 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 87481909dd..2c591344f3 100644 --- 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 > vectors; + std::vector > vectors; DataOutBase::write_eps(patches, names, vectors, flags, out); } @@ -67,7 +67,7 @@ void check_cont(unsigned int ncells, std::vector names(1); names[0] = "CutOff"; - std::vector > vectors; + std::vector > 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 ae6d194696..0f07a37b54 100644 --- 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 > vectors; + std::vector > 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 19ebf4ba2a..ec841f1927 100644 --- 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 > vectors; + std::vector > 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 011136775e..71a8533e86 100644 --- 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 > vectors; + std::vector > vectors; DataOutBase::write_povray(patches, names, vectors, flags, out); } @@ -67,7 +67,7 @@ void check_cont(unsigned int ncells, std::vector names(1); names[0] = "CutOff"; - std::vector > vectors; + std::vector > 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 fa94479dd1..76c3539ab6 100644 --- 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 > vectors; + std::vector > 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 f5136524bd..5360ab28dc 100644 --- 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 > vectors; + std::vector > 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 1122e461f8..3fac84070b 100644 --- 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 > vectors; + std::vector > 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 9c2a2648c0..2f81d3fdad 100644 --- 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 > vectors; + std::vector > 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 478a06a688..3c01d51c14 100644 --- 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 > vectors; + std::vector > 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 c08dadc9cc..cd89ac4bbb 100644 --- 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 > vectors; + std::vector > 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 a5d3a2834b..234a7f0472 100644 --- 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 > vectors; + std::vector > 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 2cafd1530d..00bd315fba 100644 --- 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 > vectors; + std::vector > 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 1b1e41a1fc..4895899413 100644 --- 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 > vectors; + std::vector > 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 6c864b7d37..4b7e9f7800 100644 --- 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 > vectors; + std::vector > 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 95d9d335c2..99a0995066 100644 --- 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 > vectors; + std::vector > 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 461522a561..869e237688 100644 --- 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(©, - std_cxx1x::ref(result), - std_cxx1x::_1), + std_cxx11::bind(©, + 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 3524d65d39..d9c6fad08f 100644 --- a/tests/base/functions_04.cc +++ b/tests/base/functions_04.cc @@ -185,7 +185,7 @@ check_function(const Functions::FlowFunction &f, DataOutBase::DXFlags dxflags; DataOutBase::GnuplotFlags gflags; - std::vector > vectors; + std::vector > 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 c5bf09d967..ca1b4a4fad 100644 --- a/tests/base/functions_05.cc +++ b/tests/base/functions_05.cc @@ -49,9 +49,9 @@ void check2 () q[d] = d; ScalarFunctionFromFunctionObject - object (std_cxx1x::bind (&Point::distance, + object (std_cxx11::bind (&Point::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 5d228c7c86..5c185e6f69 100644 --- a/tests/base/functions_06.cc +++ b/tests/base/functions_06.cc @@ -59,9 +59,9 @@ void check2 () q[d] = d; ScalarFunctionFromFunctionObject - object (std_cxx1x::bind (&Point::distance, + object (std_cxx11::bind (&Point::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 0f6714c0a5..4c2919bdec 100644 --- 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,1> &coordinates) +Table<1,double> fill (const std_cxx11::array,1> &coordinates) { Table<1,double> data(coordinates[0].size()); for (unsigned int i=0; i fill (const std_cxx1x::array,1> &coordinates return data; } -Table<2,double> fill (const std_cxx1x::array,2> &coordinates) +Table<2,double> fill (const std_cxx11::array,2> &coordinates) { Table<2,double> data(coordinates[0].size(), coordinates[1].size()); @@ -41,7 +41,7 @@ Table<2,double> fill (const std_cxx1x::array,2> &coordinates return data; } -Table<3,double> fill (const std_cxx1x::array,3> &coordinates) +Table<3,double> fill (const std_cxx11::array,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,dim> coordinates; + std_cxx11::array,dim> coordinates; for (unsigned int d=0; d fill (const std_cxx1x::array,1> &coordinates) +Table<1,double> fill (const std_cxx11::array,1> &coordinates) { Table<1,double> data(coordinates[0].size()); for (unsigned int i=0; i fill (const std_cxx1x::array,1> &coordinates return data; } -Table<2,double> fill (const std_cxx1x::array,2> &coordinates) +Table<2,double> fill (const std_cxx11::array,2> &coordinates) { Table<2,double> data(coordinates[0].size(), coordinates[1].size()); @@ -41,7 +41,7 @@ Table<2,double> fill (const std_cxx1x::array,2> &coordinates return data; } -Table<3,double> fill (const std_cxx1x::array,3> &coordinates) +Table<3,double> fill (const std_cxx11::array,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,dim> intervals; - std_cxx1x::array n_subintervals; + std_cxx11::array,dim> intervals; + std_cxx11::array n_subintervals; for (unsigned int d=0; d,dim> coordinates; + std_cxx11::array,dim> coordinates; for (unsigned int d=0; d &f, DataOutBase::DXFlags dxflags; DataOutBase::GnuplotFlags gflags; - std::vector > vectors; + std::vector > 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 c5a49ae473..eb1de9ab69 100644 --- a/tests/base/graph_coloring_01.cc +++ b/tests/base/graph_coloring_01.cc @@ -58,7 +58,7 @@ void check() typename DoFHandler::active_cell_iterator cell(dof_handler.begin_active()); std::vector::active_cell_iterator> > coloring( GraphColoring::make_graph_coloring(cell,dof_handler.end(), - std_cxx1x::function (typename + std_cxx11::function (typename DoFHandler::active_cell_iterator const &)> (&get_conflict_indices_cfem))); // Output the coloring diff --git a/tests/base/graph_coloring_02.cc b/tests/base/graph_coloring_02.cc index aa0de96795..c80cf118a3 100644 --- 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::active_cell_iterator> > coloring( GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(), - std_cxx1x::function (typename + std_cxx11::function (typename DoFHandler::active_cell_iterator const &)> (&get_conflict_indices_cfem))); // Output the coloring diff --git a/tests/base/graph_coloring_02a.cc b/tests/base/graph_coloring_02a.cc index 56a7549a30..7d4268a3f5 100644 --- 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::active_cell_iterator> > coloring( GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(), - std_cxx1x::function (typename + std_cxx11::function (typename DoFHandler::active_cell_iterator const &)> (&get_conflict_indices_cfem))); // 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 917ab49e8c..5e1cf67819 100644 --- 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::active_cell_iterator> > coloring( GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(), - std_cxx1x::function (typename + std_cxx11::function (typename hp::DoFHandler::active_cell_iterator const &)> (&get_conflict_indices_cfem))); // Output the coloring diff --git a/tests/base/graph_coloring_04.cc b/tests/base/graph_coloring_04.cc index a886c8b9af..62999cd7f9 100644 --- a/tests/base/graph_coloring_04.cc +++ b/tests/base/graph_coloring_04.cc @@ -82,7 +82,7 @@ void check () std::vector::active_cell_iterator> > coloring = GraphColoring::make_graph_coloring(stokes_dof_handler.begin_active(), stokes_dof_handler.end(), - std_cxx1x::function ( + std_cxx11::function ( const typename DoFHandler::active_cell_iterator &)>(&get_conflict_indices)); for (unsigned int c=0; c::active_cell_iterator> > coloring( GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(), - std_cxx1x::function (typename + std_cxx11::function (typename DoFHandler::active_cell_iterator const &)> (&get_conflict_indices_cfem))); // 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 744fee478e..9f41c665bf 100644 --- 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_cxx11::function (typename DoFHandler::active_cell_iterator const &)> (&get_conflict_indices_cfem)); diff --git a/tests/base/named_data.cc b/tests/base/named_data.cc index 068263e0f1..e9f61abc60 100644 --- a/tests/base/named_data.cc +++ b/tests/base/named_data.cc @@ -57,17 +57,17 @@ test_selector(const NamedData &data) void test_shared_pointer() { - NamedData > data; + NamedData > data; deallog << "const" << data.is_const() << std::endl; - std_cxx1x::shared_ptr p = std_cxx1x::shared_ptr(new double); + std_cxx11::shared_ptr p = std_cxx11::shared_ptr(new double); data.add(p, "P1"); - p = std_cxx1x::shared_ptr(new double); + p = std_cxx11::shared_ptr(new double); data.add(p, "P2"); - p = std_cxx1x::shared_ptr(new double); + p = std_cxx11::shared_ptr(new double); data.add(p, "P3"); - p = std_cxx1x::shared_ptr(new double); + p = std_cxx11::shared_ptr(new double); data.add(p, "P4"); - p = std_cxx1x::shared_ptr(new double); + p = std_cxx11::shared_ptr(new double); data.add(p, "P5"); for (unsigned int i=0; i > &solver, - std_cxx1x::function (double const, Vector const &)> f, - std_cxx1x::function (double const, double const, Vector const &)> id_minus_tau_J_inv, - std_cxx1x::function my) + std_cxx11::function (double const, Vector const &)> f, + std_cxx11::function (double const, double const, Vector const &)> id_minus_tau_J_inv, + std_cxx11::function my) { unsigned int n_time_steps = 1; unsigned int size = 1; @@ -143,9 +143,9 @@ void test(TimeStepping::RungeKutta > &solver, } void test2(TimeStepping::EmbeddedExplicitRungeKutta > &solver, - std_cxx1x::function (double const, Vector const &)> f, - std_cxx1x::function (double const, double const, Vector const &)> id_minus_tau_J_inv, - std_cxx1x::function my) + std_cxx11::function (double const, Vector const &)> f, + std_cxx11::function (double const, double const, Vector const &)> id_minus_tau_J_inv, + std_cxx11::function 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 2916819181..6a95d7d637 100644 --- a/tests/base/work_stream_03.cc +++ b/tests/base/work_stream_03.cc @@ -113,8 +113,8 @@ mass_assembler(const typename Triangulation::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, - std_cxx1x::bind(©_local_to_global, std_cxx1x::_1, &sum), + std_cxx11::bind(©_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 4aface31ad..4cc0d24cce 100644 --- 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::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_cxx11::function (const Triangulation::active_cell_iterator &)> (&conflictor)), &mass_assembler, - std_cxx1x::bind(©_local_to_global, std_cxx1x::_1, &sum), + std_cxx11::bind(©_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 ebda814629..5b4c4d2e98 100644 --- 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(), + std_cxx11::function(), ScratchData(), 0U); // next run with only a copier WorkStream::run (v.begin(), v.end(), - std_cxx1x::function::iterator, + std_cxx11::function::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 c0c88a2127..311e2b5702 100644 --- 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_cxx11::function (const std::vector::iterator &)> (&conflictor)), &worker, &copier, diff --git a/tests/benchmarks/step-22/step-22.cc b/tests/benchmarks/step-22/step-22.cc index a5b00eee96..a674c08546 100644 --- 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::type> A_preconditioner; + std_cxx11::shared_ptr::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::type>(new typename InnerPreconditioner::type()); + = std_cxx11::shared_ptr::type>(new typename InnerPreconditioner::type()); A_preconditioner->initialize (system_matrix.block(0,0), typename InnerPreconditioner::type::AdditionalData()); diff --git a/tests/benchmarks/test_assembly/step-22.cc b/tests/benchmarks/test_assembly/step-22.cc index b645bb7984..2435277088 100644 --- 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::type> A_preconditioner; + std_cxx11::shared_ptr::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::type>(new typename InnerPreconditioner::type()); + = std_cxx11::shared_ptr::type>(new typename InnerPreconditioner::type()); A_preconditioner->initialize (system_matrix.block(0,0), typename InnerPreconditioner::type::AdditionalData()); diff --git a/tests/bits/data_out_04.cc b/tests/bits/data_out_04.cc index c525c2bfe4..30ba5d1189 100644 --- a/tests/bits/data_out_04.cc +++ b/tests/bits/data_out_04.cc @@ -49,16 +49,16 @@ public: return DataOut::get_dataset_names(); } - std::vector > + std::vector > get_vector_data_ranges () const { // if we have enough components for a // vector solution, make the last dim // components a vector - std::vector > + std::vector > retval; if (get_dataset_names().size() >= dim) - retval.push_back (std_cxx1x::tuple + retval.push_back (std_cxx11::tuple (get_dataset_names().size()-dim, get_dataset_names().size()-1, @@ -85,7 +85,7 @@ public: return DataOutReader::get_dataset_names(); } - std::vector > + std::vector > get_vector_data_ranges () const { return DataOutReader::get_vector_data_ranges (); @@ -136,23 +136,23 @@ check_this (const DoFHandler &dof_handler, ExcInternalError()); for (unsigned int i=0; i(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 9c4a5402ab..a03ff9c6d1 100644 --- a/tests/bits/data_out_faces_04.cc +++ b/tests/bits/data_out_faces_04.cc @@ -49,7 +49,7 @@ public: return DataOutFaces::get_dataset_names(); } - std::vector > + std::vector > get_vector_data_ranges () const { return DataOutFaces::get_vector_data_ranges (); @@ -74,7 +74,7 @@ public: return DataOutReader::get_dataset_names(); } - std::vector > + std::vector > get_vector_data_ranges () const { return DataOutReader::get_vector_data_ranges (); @@ -137,23 +137,23 @@ my_check_this (const DoFHandler &dof_handler, ExcInternalError()); for (unsigned int i=0; i(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 d33bf1678b..c24df1138c 100644 --- a/tests/bits/data_out_rotation_04.cc +++ b/tests/bits/data_out_rotation_04.cc @@ -49,7 +49,7 @@ public: return DataOutRotation::get_dataset_names(); } - std::vector > + std::vector > get_vector_data_ranges () const { return DataOutRotation::get_vector_data_ranges (); @@ -74,7 +74,7 @@ public: return DataOutReader::get_dataset_names(); } - std::vector > + std::vector > get_vector_data_ranges () const { return DataOutReader::get_vector_data_ranges (); @@ -138,23 +138,23 @@ my_check_this (const DoFHandler &dof_handler, ExcInternalError()); for (unsigned int i=0; i(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 10bd4e64ed..c39dfaeea6 100644 --- 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::postprocess_one_cell, - std_cxx1x::ref(*this), - std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3), - std_cxx1x::function(), + std_cxx11::bind (&HDG::postprocess_one_cell, + std_cxx11::ref(*this), + std_cxx11::_1, std_cxx11::_2, std_cxx11::_3), + std_cxx11::function(), scratch, 0U); } diff --git a/tests/bits/step-51p.cc b/tests/bits/step-51p.cc index 5fea2153af..4d15d434d7 100644 --- 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::postprocess_one_cell, - std_cxx1x::ref(*this), - std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3), - std_cxx1x::function(), + std_cxx11::bind (&HDG::postprocess_one_cell, + std_cxx11::ref(*this), + std_cxx11::_1, std_cxx11::_2, std_cxx11::_3), + std_cxx11::function(), scratch, 0U); } diff --git a/tests/deal.II/assemble_matrix_parallel_01.cc b/tests/deal.II/assemble_matrix_parallel_01.cc index fb9dff2621..92657db966 100644 --- a/tests/deal.II/assemble_matrix_parallel_01.cc +++ b/tests/deal.II/assemble_matrix_parallel_01.cc @@ -260,9 +260,9 @@ void LaplaceProblem::setup_system () constraints.close (); graph = GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(), - static_cast + static_cast (typename hp::DoFHandler::active_cell_iterator const &)> > - (std_cxx1x::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx1x::_1))); + (std_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); CompressedSimpleSparsityPattern csp (dof_handler.n_dofs(), @@ -363,16 +363,16 @@ void LaplaceProblem::assemble_test () WorkStream:: run (graph, - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::bind (&LaplaceProblem:: local_assemble, this, - std_cxx1x::_1, - std_cxx1x::_2, - std_cxx1x::_3), - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::_1, + std_cxx11::_2, + std_cxx11::_3), + std_cxx11::bind (&LaplaceProblem:: copy_local_to_global, this, - std_cxx1x::_1), + std_cxx11::_1), Assembly::Scratch::Data(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 c3e51ddd6d..406e424bea 100644 --- a/tests/deal.II/assemble_matrix_parallel_02.cc +++ b/tests/deal.II/assemble_matrix_parallel_02.cc @@ -278,9 +278,9 @@ void LaplaceProblem::setup_system () constraints.close (); graph = GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(), - static_cast + static_cast (typename hp::DoFHandler::active_cell_iterator const &)> > - (std_cxx1x::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx1x::_1))); + (std_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); CompressedSimpleSparsityPattern csp (dof_handler.n_dofs(), @@ -389,16 +389,16 @@ void LaplaceProblem::assemble_test_1 () WorkStream:: run (graph, - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::bind (&LaplaceProblem:: local_assemble, this, - std_cxx1x::_1, - std_cxx1x::_2, - std_cxx1x::_3), - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::_1, + std_cxx11::_2, + std_cxx11::_3), + std_cxx11::bind (&LaplaceProblem:: copy_local_to_global, this, - std_cxx1x::_1), + std_cxx11::_1), Assembly::Scratch::Data(fe_collection, quadrature_collection), Assembly::Copy::Data (), multithread_info.n_threads(), @@ -414,16 +414,16 @@ void LaplaceProblem::assemble_test_2 () WorkStream:: run (graph, - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::bind (&LaplaceProblem:: local_assemble, this, - std_cxx1x::_1, - std_cxx1x::_2, - std_cxx1x::_3), - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::_1, + std_cxx11::_2, + std_cxx11::_3), + std_cxx11::bind (&LaplaceProblem:: copy_local_to_global, this, - std_cxx1x::_1), + std_cxx11::_1), Assembly::Scratch::Data(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 158aec8ba7..b39e4cc65e 100644 --- a/tests/deal.II/assemble_matrix_parallel_03.cc +++ b/tests/deal.II/assemble_matrix_parallel_03.cc @@ -260,9 +260,9 @@ void LaplaceProblem::setup_system () constraints.close (); graph = GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(), - static_cast + static_cast (typename hp::DoFHandler::active_cell_iterator const &)> > - (std_cxx1x::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx1x::_1))); + (std_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); BlockCompressedSimpleSparsityPattern csp (2, 2); @@ -367,16 +367,16 @@ void LaplaceProblem::assemble_test () WorkStream:: run (graph, - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::bind (&LaplaceProblem:: local_assemble, this, - std_cxx1x::_1, - std_cxx1x::_2, - std_cxx1x::_3), - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::_1, + std_cxx11::_2, + std_cxx11::_3), + std_cxx11::bind (&LaplaceProblem:: copy_local_to_global, this, - std_cxx1x::_1), + std_cxx11::_1), Assembly::Scratch::Data(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 18cdb2b707..f8c8c27d9d 100644 --- a/tests/deal.II/assemble_matrix_parallel_04.cc +++ b/tests/deal.II/assemble_matrix_parallel_04.cc @@ -290,9 +290,9 @@ void LaplaceProblem::setup_system () constraints.close (); graph = GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(), - static_cast + static_cast (typename hp::DoFHandler::active_cell_iterator const &)> > - (std_cxx1x::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx1x::_1))); + (std_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); CompressedSimpleSparsityPattern csp (dof_handler.n_dofs(), @@ -417,16 +417,16 @@ void LaplaceProblem::assemble_test_1 () WorkStream:: run (graph, - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::bind (&LaplaceProblem:: local_assemble, this, - std_cxx1x::_1, - std_cxx1x::_2, - std_cxx1x::_3), - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::_1, + std_cxx11::_2, + std_cxx11::_3), + std_cxx11::bind (&LaplaceProblem:: copy_local_to_global, this, - std_cxx1x::_1), + std_cxx11::_1), Assembly::Scratch::Data(fe_collection, quadrature_collection), Assembly::Copy::Data (1), 2*multithread_info.n_threads(), @@ -448,16 +448,16 @@ void LaplaceProblem::assemble_test_2 () WorkStream:: run (graph, - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::bind (&LaplaceProblem:: local_assemble, this, - std_cxx1x::_1, - std_cxx1x::_2, - std_cxx1x::_3), - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::_1, + std_cxx11::_2, + std_cxx11::_3), + std_cxx11::bind (&LaplaceProblem:: copy_local_to_global, this, - std_cxx1x::_1), + std_cxx11::_1), Assembly::Scratch::Data(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 2b7d6bfc46..08c2fd8712 100644 --- a/tests/deal.II/dof_renumbering_02.cc +++ b/tests/deal.II/dof_renumbering_02.cc @@ -45,12 +45,12 @@ print_dofs (const DoFHandler &dof) { const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx1x::shared_ptr > fevalues; + std_cxx11::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx1x::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); @@ -78,12 +78,12 @@ print_dofs (const MGDoFHandler &dof, unsigned int level) { const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx1x::shared_ptr > fevalues; + std_cxx11::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx1x::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); } for (typename MGDoFHandler::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 0686b5341d..a1034b86f1 100644 --- a/tests/deal.II/dof_renumbering_03.cc +++ b/tests/deal.II/dof_renumbering_03.cc @@ -45,12 +45,12 @@ print_dofs (const DoFHandler &dof) { const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx1x::shared_ptr > fevalues; + std_cxx11::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx1x::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); } for (typename DoFHandler::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 58da5678ea..ed88cd6a4a 100644 --- a/tests/deal.II/dof_renumbering_04.cc +++ b/tests/deal.II/dof_renumbering_04.cc @@ -45,12 +45,12 @@ print_dofs (const DoFHandler &dof) { const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx1x::shared_ptr > fevalues; + std_cxx11::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx1x::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); } for (typename DoFHandler::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 2403cab37c..f9f5df1dcb 100644 --- a/tests/deal.II/dof_renumbering_05.cc +++ b/tests/deal.II/dof_renumbering_05.cc @@ -45,12 +45,12 @@ print_dofs (const DoFHandler &dof) { const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx1x::shared_ptr > fevalues; + std_cxx11::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx1x::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); } for (typename DoFHandler::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 f50e487379..eedd5f9fa7 100644 --- a/tests/deal.II/dof_renumbering_06.cc +++ b/tests/deal.II/dof_renumbering_06.cc @@ -45,12 +45,12 @@ print_dofs (const DoFHandler &dof) { const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx1x::shared_ptr > fevalues; + std_cxx11::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx1x::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); } for (typename DoFHandler::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 db70f9a232..74f02e0506 100644 --- a/tests/deal.II/dof_renumbering_07.cc +++ b/tests/deal.II/dof_renumbering_07.cc @@ -44,12 +44,12 @@ print_dofs (const DoFHandler &dof) { const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx1x::shared_ptr > fevalues; + std_cxx11::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx1x::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); } for (typename DoFHandler::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 7f76b88942..846b6c9d66 100644 --- 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 &dof, stream &out) { const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx1x::shared_ptr > fevalues; + std_cxx11::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx1x::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); } for (typename DoFHandler::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 a5522fd2a5..865d70d5bf 100644 --- 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 &dof, stream &out) out << std::fixed; const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx1x::shared_ptr > fevalues; + std_cxx11::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx1x::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); } for (typename DoFHandler::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 6279b4a0b8..44844126f9 100644 --- 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, + .connect (std_cxx11::bind (&pre_refinement_notification, "tria_1", - std_cxx1x::cref(tria_1))), + std_cxx11::cref(tria_1))), tria_1.signals.post_refinement - .connect (std_cxx1x::bind (&post_refinement_notification, + .connect (std_cxx11::bind (&post_refinement_notification, "tria_1", - std_cxx1x::cref(tria_1))), + std_cxx11::cref(tria_1))), tria_1.signals.create - .connect (std_cxx1x::bind (&create_notification, + .connect (std_cxx11::bind (&create_notification, "tria_1", - std_cxx1x::cref(tria_1))), + std_cxx11::cref(tria_1))), tria_1.signals.copy - .connect (std_cxx1x::bind (©_notification, + .connect (std_cxx11::bind (©_notification, "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, + .connect (std_cxx11::bind (&pre_refinement_notification, "tria_2", - std_cxx1x::cref(tria_2))), + std_cxx11::cref(tria_2))), tria_2.signals.post_refinement - .connect (std_cxx1x::bind (&post_refinement_notification, + .connect (std_cxx11::bind (&post_refinement_notification, "tria_2", - std_cxx1x::cref(tria_2))), + std_cxx11::cref(tria_2))), tria_2.signals.create - .connect (std_cxx1x::bind (&create_notification, + .connect (std_cxx11::bind (&create_notification, "tria_2", - std_cxx1x::cref(tria_2))), + std_cxx11::cref(tria_2))), tria_2.signals.copy - .connect (std_cxx1x::bind (©_notification, + .connect (std_cxx11::bind (©_notification, "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 084648a064..d820d9a63c 100644 --- 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, + .connect (std_cxx11::bind (&pre_refinement_notification, "tria_1", - std_cxx1x::cref(tria_1))), + std_cxx11::cref(tria_1))), tria_1.signals.post_refinement - .connect (std_cxx1x::bind (&post_refinement_notification, + .connect (std_cxx11::bind (&post_refinement_notification, "tria_1", - std_cxx1x::cref(tria_1))), + std_cxx11::cref(tria_1))), tria_1.signals.create - .connect (std_cxx1x::bind (&create_notification, + .connect (std_cxx11::bind (&create_notification, "tria_1", - std_cxx1x::cref(tria_1))), + std_cxx11::cref(tria_1))), tria_1.signals.copy - .connect (std_cxx1x::bind (©_notification, + .connect (std_cxx11::bind (©_notification, "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, + .connect (std_cxx11::bind (&any_change_notification, "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, + .connect (std_cxx11::bind (&pre_refinement_notification, "tria_2", - std_cxx1x::cref(tria_2))), + std_cxx11::cref(tria_2))), tria_2.signals.post_refinement - .connect (std_cxx1x::bind (&post_refinement_notification, + .connect (std_cxx11::bind (&post_refinement_notification, "tria_2", - std_cxx1x::cref(tria_2))), + std_cxx11::cref(tria_2))), tria_2.signals.create - .connect (std_cxx1x::bind (&create_notification, + .connect (std_cxx11::bind (&create_notification, "tria_2", - std_cxx1x::cref(tria_2))), + std_cxx11::cref(tria_2))), tria_2.signals.copy - .connect (std_cxx1x::bind (©_notification, + .connect (std_cxx11::bind (©_notification, "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, + .connect (std_cxx11::bind (&any_change_notification, "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 7ee2e630dc..0c624ee903 100644 --- a/tests/fe/fe_q_dg0.cc +++ b/tests/fe/fe_q_dg0.cc @@ -111,7 +111,7 @@ namespace Step22 BlockVector solution; BlockVector system_rhs; - std_cxx1x::shared_ptr::type> + std_cxx11::shared_ptr::type> A_preconditioner; ConvergenceTable convergence_table; @@ -627,7 +627,7 @@ namespace Step22 } A_preconditioner - = std_cxx1x::shared_ptr::type>(new + = std_cxx11::shared_ptr::type>(new typename InnerPreconditioner::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 5a4063ae60..d8d92939a5 100644 --- a/tests/integrators/cells_and_faces_01.cc +++ b/tests/integrators/cells_and_faces_01.cc @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include @@ -116,9 +116,9 @@ test_mesh(MGDoFHandler &mgdofs) MeshWorker::loop, EmptyInfoBox> (dofs.begin_active(), dofs.end(), dof_info, info_box, - std_cxx1x::bind (&Local::cell, local, std_cxx1x::_1, std_cxx1x::_2), - std_cxx1x::bind (&Local::bdry, local, std_cxx1x::_1, std_cxx1x::_2), - std_cxx1x::bind (&Local::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4), + std_cxx11::bind (&Local::cell, local, std_cxx11::_1, std_cxx11::_2), + std_cxx11::bind (&Local::bdry, local, std_cxx11::_1, std_cxx11::_2), + std_cxx11::bind (&Local::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 &mgdofs) MeshWorker::loop, EmptyInfoBox> (mgdofs.begin(), mgdofs.end(), mg_dof_info, info_box, - std_cxx1x::bind (&Local::cell, local, std_cxx1x::_1, std_cxx1x::_2), - std_cxx1x::bind (&Local::bdry, local, std_cxx1x::_1, std_cxx1x::_2), - std_cxx1x::bind (&Local::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4), + std_cxx11::bind (&Local::cell, local, std_cxx11::_1, std_cxx11::_2), + std_cxx11::bind (&Local::bdry, local, std_cxx11::_1, std_cxx11::_2), + std_cxx11::bind (&Local::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 f9053ceb23..58a7872363 100644 --- a/tests/integrators/functional_01.cc +++ b/tests/integrators/functional_01.cc @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include @@ -99,9 +99,9 @@ test_mesh(MGDoFHandler &mgdofs) MeshWorker::loop, EmptyInfoBox> (dofs.begin_active(), dofs.end(), dof_info, info_box, - std_cxx1x::bind (&Local::cell, local, std_cxx1x::_1, std_cxx1x::_2), - std_cxx1x::bind (&Local::bdry, local, std_cxx1x::_1, std_cxx1x::_2), - std_cxx1x::bind (&Local::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4), + std_cxx11::bind (&Local::cell, local, std_cxx11::_1, std_cxx11::_2), + std_cxx11::bind (&Local::bdry, local, std_cxx11::_1, std_cxx11::_2), + std_cxx11::bind (&Local::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 &mgdofs) MeshWorker::loop, EmptyInfoBox> (mgdofs.begin(), mgdofs.end(), mg_dof_info, info_box, - std_cxx1x::bind (&Local::cell, local, std_cxx1x::_1, std_cxx1x::_2), - std_cxx1x::bind (&Local::bdry, local, std_cxx1x::_1, std_cxx1x::_2), - std_cxx1x::bind (&Local::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4), + std_cxx11::bind (&Local::cell, local, std_cxx11::_1, std_cxx11::_2), + std_cxx11::bind (&Local::bdry, local, std_cxx11::_1, std_cxx11::_2), + std_cxx11::bind (&Local::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 8d5961a9fe..211995cdea 100644 --- a/tests/integrators/mesh_worker_01.cc +++ b/tests/integrators/mesh_worker_01.cc @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include @@ -149,9 +149,9 @@ test_simple(MGDoFHandler &mgdofs) MeshWorker::loop, MeshWorker::IntegrationInfoBox > (dofs.begin_active(), dofs.end(), dof_info, info_box, - std_cxx1x::bind (&Local::cell, local, std_cxx1x::_1, std_cxx1x::_2), - std_cxx1x::bind (&Local::bdry, local, std_cxx1x::_1, std_cxx1x::_2), - std_cxx1x::bind (&Local::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4), + std_cxx11::bind (&Local::cell, local, std_cxx11::_1, std_cxx11::_2), + std_cxx11::bind (&Local::bdry, local, std_cxx11::_1, std_cxx11::_2), + std_cxx11::bind (&Local::face, local, std_cxx11::_1, std_cxx11::_2, std_cxx11::_3, std_cxx11::_4), assembler, true); for (unsigned int i=0; i > > fe2; - fe2.push_back(std_cxx1x::shared_ptr >(new FE_DGP<2>(1))); - fe2.push_back(std_cxx1x::shared_ptr >(new FE_Q<2>(1))); + std::vector > > fe2; + fe2.push_back(std_cxx11::shared_ptr >(new FE_DGP<2>(1))); + fe2.push_back(std_cxx11::shared_ptr >(new FE_Q<2>(1))); for (unsigned int i=0; i > > fe2; - fe2.push_back(std_cxx1x::shared_ptr >(new FE_DGP<2>(1))); -// fe2.push_back(std_cxx1x::shared_ptr >(new FE_Q<2>(1))); + std::vector > > fe2; + fe2.push_back(std_cxx11::shared_ptr >(new FE_DGP<2>(1))); +// fe2.push_back(std_cxx11::shared_ptr >(new FE_Q<2>(1))); for (unsigned int i=0; i dgp1(1); FE_Q<2> q1(1); - std::vector > > fe2; - fe2.push_back(std_cxx1x::shared_ptr >(new FE_DGP<2>(0))); - fe2.push_back(std_cxx1x::shared_ptr >(new FESystem<2>(dgp0,3))); - fe2.push_back(std_cxx1x::shared_ptr >(new FESystem<2>(dgp1,2))); - fe2.push_back(std_cxx1x::shared_ptr >(new FESystem<2>(q1,2))); - fe2.push_back(std_cxx1x::shared_ptr >(new FESystem<2>(dgp0,1,q1,1))); -// fe2.push_back(std_cxx1x::shared_ptr >(new FE_Q<2>(1))); + std::vector > > fe2; + fe2.push_back(std_cxx11::shared_ptr >(new FE_DGP<2>(0))); + fe2.push_back(std_cxx11::shared_ptr >(new FESystem<2>(dgp0,3))); + fe2.push_back(std_cxx11::shared_ptr >(new FESystem<2>(dgp1,2))); + fe2.push_back(std_cxx11::shared_ptr >(new FESystem<2>(q1,2))); + fe2.push_back(std_cxx11::shared_ptr >(new FESystem<2>(dgp0,1,q1,1))); +// fe2.push_back(std_cxx11::shared_ptr >(new FE_Q<2>(1))); for (unsigned int i=0; i #include -#include +#include #include #include #include @@ -255,12 +255,12 @@ namespace Advection MeshWorker::loop, MeshWorker::IntegrationInfoBox > (dof_handler.begin_active(), dof_handler.end(), dof_info, info_box, - std_cxx1x::bind(&AdvectionProblem::integrate_cell_term, - this, std_cxx1x::_1, std_cxx1x::_2), - std_cxx1x::bind(&AdvectionProblem::integrate_boundary_term, - this, std_cxx1x::_1, std_cxx1x::_2), - std_cxx1x::bind(&AdvectionProblem::integrate_face_term, - this, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4), + std_cxx11::bind(&AdvectionProblem::integrate_cell_term, + this, std_cxx11::_1, std_cxx11::_2), + std_cxx11::bind(&AdvectionProblem::integrate_boundary_term, + this, std_cxx11::_1, std_cxx11::_2), + std_cxx11::bind(&AdvectionProblem::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 004d6a3d4e..daf90dfffb 100644 --- a/tests/integrators/mesh_worker_matrix_01.cc +++ b/tests/integrators/mesh_worker_matrix_01.cc @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include @@ -154,9 +154,9 @@ test_simple(DoFHandler &dofs, bool faces) MeshWorker::loop, MeshWorker::IntegrationInfoBox > (dofs.begin_active(), dofs.end(), dof_info, info_box, - std_cxx1x::bind (&Local::cell, local, std_cxx1x::_1, std_cxx1x::_2), - std_cxx1x::bind (&Local::bdry, local, std_cxx1x::_1, std_cxx1x::_2), - std_cxx1x::bind (&Local::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4), + std_cxx11::bind (&Local::cell, local, std_cxx11::_1, std_cxx11::_2), + std_cxx11::bind (&Local::bdry, local, std_cxx11::_1, std_cxx11::_2), + std_cxx11::bind (&Local::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 bea4f8ac59..ee59d906be 100644 --- 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 &src) const { dst = 0; - const std_cxx1x::function &, + const std_cxx11::function &, Vector &, const Vector &, const std::pair &)> diff --git a/tests/matrix_free/matrix_vector_12.cc b/tests/matrix_free/matrix_vector_12.cc index 0c497fe15b..7ee79f9282 100644 --- 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 &, + const std_cxx11::function &, std::vector > &, const std::vector > &, const std::pair &)> diff --git a/tests/matrix_free/matrix_vector_13.cc b/tests/matrix_free/matrix_vector_13.cc index c777c8c79c..d37665213b 100644 --- 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 &src) const { dst = 0; - const std_cxx1x::function &, + const std_cxx11::function &, parallel::distributed::BlockVector &, const parallel::distributed::BlockVector &, const std::pair &)> diff --git a/tests/matrix_free/matrix_vector_mf.h b/tests/matrix_free/matrix_vector_mf.h index 6b3fe20a0e..3969e7e288 100644 --- 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 &, + const std_cxx11::function &, VECTOR &, const VECTOR &, const std::pair &)> diff --git a/tests/mpi/crash_06.cc b/tests/mpi/crash_06.cc index f6fcc5dd11..e33212b09f 100644 --- a/tests/mpi/crash_06.cc +++ b/tests/mpi/crash_06.cc @@ -76,14 +76,14 @@ void test(FiniteElement &fe) template void testit() { - std::vector > > fes; - fes.push_back(std_cxx1x::shared_ptr >(new FE_RaviartThomas(0))); - fes.push_back(std_cxx1x::shared_ptr >(new FE_RaviartThomas(1))); - fes.push_back(std_cxx1x::shared_ptr >(new FE_Nedelec(0))); - fes.push_back(std_cxx1x::shared_ptr >(new FE_Nedelec(1))); - fes.push_back(std_cxx1x::shared_ptr >(new FE_Q(3))); - fes.push_back(std_cxx1x::shared_ptr >(new FE_DGQ(2))); - fes.push_back(std_cxx1x::shared_ptr >(new FE_Q_DG0(2))); + std::vector > > fes; + fes.push_back(std_cxx11::shared_ptr >(new FE_RaviartThomas(0))); + fes.push_back(std_cxx11::shared_ptr >(new FE_RaviartThomas(1))); + fes.push_back(std_cxx11::shared_ptr >(new FE_Nedelec(0))); + fes.push_back(std_cxx11::shared_ptr >(new FE_Nedelec(1))); + fes.push_back(std_cxx11::shared_ptr >(new FE_Q(3))); + fes.push_back(std_cxx11::shared_ptr >(new FE_DGQ(2))); + fes.push_back(std_cxx11::shared_ptr >(new FE_Q_DG0(2))); for (unsigned int i=0;i &dofs, MeshWorker::LoopControl &lctrl) // typename identity::type end, // DOFINFO &dinfo, // INFOBOX &info, -// const std_cxx1x::function &cell_worker, -// const std_cxx1x::function &boundary_worker, -// const std_cxx1x::function &cell_worker, +// const std_cxx11::function &boundary_worker, +// const std_cxx11::function &face_worker, // ASSEMBLER &assembler, @@ -123,9 +123,9 @@ test_simple(DoFHandler &dofs, MeshWorker::LoopControl &lctrl) // MeshWorker::loop, MeshWorker::IntegrationInfoBox > // (dofs.begin_active(), dofs.end(), // dof_info, info_box, -// std_cxx1x::bind (&Integrator::cell, local, std_cxx1x::_1, std_cxx1x::_2), -// std_cxx1x::bind (&Integrator::bdry, local, std_cxx1x::_1, std_cxx1x::_2), -// std_cxx1x::bind (&Integrator::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4), +// std_cxx11::bind (&Integrator::cell, local, std_cxx11::_1, std_cxx11::_2), +// std_cxx11::bind (&Integrator::bdry, local, std_cxx11::_1, std_cxx11::_2), +// std_cxx11::bind (&Integrator::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 f4ceb8c260..f958d239a9 100644 --- a/tests/mpi/mesh_worker_02.cc +++ b/tests/mpi/mesh_worker_02.cc @@ -102,9 +102,9 @@ test_simple(DoFHandler &dofs, MeshWorker::LoopControl &lctrl) // typename identity::type end, // DOFINFO &dinfo, // INFOBOX &info, -// const std_cxx1x::function &cell_worker, -// const std_cxx1x::function &boundary_worker, -// const std_cxx1x::function &cell_worker, +// const std_cxx11::function &boundary_worker, +// const std_cxx11::function &face_worker, // ASSEMBLER &assembler, @@ -122,9 +122,9 @@ test_simple(DoFHandler &dofs, MeshWorker::LoopControl &lctrl) // MeshWorker::loop, MeshWorker::IntegrationInfoBox > // (dofs.begin_active(), dofs.end(), // dof_info, info_box, -// std_cxx1x::bind (&Integrator::cell, local, std_cxx1x::_1, std_cxx1x::_2), -// std_cxx1x::bind (&Integrator::bdry, local, std_cxx1x::_1, std_cxx1x::_2), -// std_cxx1x::bind (&Integrator::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4), +// std_cxx11::bind (&Integrator::cell, local, std_cxx11::_1, std_cxx11::_2), +// std_cxx11::bind (&Integrator::bdry, local, std_cxx11::_1, std_cxx11::_2), +// std_cxx11::bind (&Integrator::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 c895872ab5..3368d0bbf3 100644 --- a/tests/mpi/mesh_worker_03.cc +++ b/tests/mpi/mesh_worker_03.cc @@ -102,9 +102,9 @@ test_simple(DoFHandler &dofs, MeshWorker::LoopControl &lctrl) // typename identity::type end, // DOFINFO &dinfo, // INFOBOX &info, -// const std_cxx1x::function &cell_worker, -// const std_cxx1x::function &boundary_worker, -// const std_cxx1x::function &cell_worker, +// const std_cxx11::function &boundary_worker, +// const std_cxx11::function &face_worker, // ASSEMBLER &assembler, @@ -122,9 +122,9 @@ test_simple(DoFHandler &dofs, MeshWorker::LoopControl &lctrl) // MeshWorker::loop, MeshWorker::IntegrationInfoBox > // (dofs.begin_active(), dofs.end(), // dof_info, info_box, -// std_cxx1x::bind (&Integrator::cell, local, std_cxx1x::_1, std_cxx1x::_2), -// std_cxx1x::bind (&Integrator::bdry, local, std_cxx1x::_1, std_cxx1x::_2), -// std_cxx1x::bind (&Integrator::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4), +// std_cxx11::bind (&Integrator::cell, local, std_cxx11::_1, std_cxx11::_2), +// std_cxx11::bind (&Integrator::bdry, local, std_cxx11::_1, std_cxx11::_2), +// std_cxx11::bind (&Integrator::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 ecac402bf0..21df311214 100644 --- a/tests/mpi/mesh_worker_04.cc +++ b/tests/mpi/mesh_worker_04.cc @@ -103,9 +103,9 @@ test_simple(DoFHandler &dofs, MeshWorker::LoopControl &lctrl) // typename identity::type end, // DOFINFO &dinfo, // INFOBOX &info, -// const std_cxx1x::function &cell_worker, -// const std_cxx1x::function &boundary_worker, -// const std_cxx1x::function &cell_worker, +// const std_cxx11::function &boundary_worker, +// const std_cxx11::function &face_worker, // ASSEMBLER &assembler, @@ -123,9 +123,9 @@ test_simple(DoFHandler &dofs, MeshWorker::LoopControl &lctrl) // MeshWorker::loop, MeshWorker::IntegrationInfoBox > // (dofs.begin_active(), dofs.end(), // dof_info, info_box, -// std_cxx1x::bind (&Integrator::cell, local, std_cxx1x::_1, std_cxx1x::_2), -// std_cxx1x::bind (&Integrator::bdry, local, std_cxx1x::_1, std_cxx1x::_2), -// std_cxx1x::bind (&Integrator::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4), +// std_cxx11::bind (&Integrator::cell, local, std_cxx11::_1, std_cxx11::_2), +// std_cxx11::bind (&Integrator::bdry, local, std_cxx11::_1, std_cxx11::_2), +// std_cxx11::bind (&Integrator::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 3387e1abc5..07e85ee08d 100644 --- a/tests/mpi/mesh_worker_05.cc +++ b/tests/mpi/mesh_worker_05.cc @@ -104,9 +104,9 @@ test_simple(DoFHandler &dofs, MeshWorker::LoopControl &lctrl) // typename identity::type end, // DOFINFO &dinfo, // INFOBOX &info, -// const std_cxx1x::function &cell_worker, -// const std_cxx1x::function &boundary_worker, -// const std_cxx1x::function &cell_worker, +// const std_cxx11::function &boundary_worker, +// const std_cxx11::function &face_worker, // ASSEMBLER &assembler, @@ -124,9 +124,9 @@ test_simple(DoFHandler &dofs, MeshWorker::LoopControl &lctrl) // MeshWorker::loop, MeshWorker::IntegrationInfoBox > // (dofs.begin_active(), dofs.end(), // dof_info, info_box, -// std_cxx1x::bind (&Integrator::cell, local, std_cxx1x::_1, std_cxx1x::_2), -// std_cxx1x::bind (&Integrator::bdry, local, std_cxx1x::_1, std_cxx1x::_2), -// std_cxx1x::bind (&Integrator::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4), +// std_cxx11::bind (&Integrator::cell, local, std_cxx11::_1, std_cxx11::_2), +// std_cxx11::bind (&Integrator::bdry, local, std_cxx11::_1, std_cxx11::_2), +// std_cxx11::bind (&Integrator::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 ae8439f3e7..63972311c1 100644 --- a/tests/mpi/mesh_worker_matrix_01.cc +++ b/tests/mpi/mesh_worker_matrix_01.cc @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include @@ -159,9 +159,9 @@ test_simple(DoFHandler &dofs, bool faces) MeshWorker::loop, MeshWorker::IntegrationInfoBox > (cell, end, dof_info, info_box, - std_cxx1x::bind (&Local::cell, local, std_cxx1x::_1, std_cxx1x::_2), - std_cxx1x::bind (&Local::bdry, local, std_cxx1x::_1, std_cxx1x::_2), - std_cxx1x::bind (&Local::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4), + std_cxx11::bind (&Local::cell, local, std_cxx11::_1, std_cxx11::_2), + std_cxx11::bind (&Local::bdry, local, std_cxx11::_1, std_cxx11::_2), + std_cxx11::bind (&Local::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 2a95e8ab48..cf1aab5396 100644 --- a/tests/multigrid/mg_renumbered_02.cc +++ b/tests/multigrid/mg_renumbered_02.cc @@ -62,7 +62,7 @@ #include #include -#include +#include using namespace dealii; @@ -265,7 +265,7 @@ LaplaceProblem::output_gpl(const MGDoFHandler &dof, MeshWorker::loop, MeshWorker::IntegrationInfoBox > ( dof.begin(l), dof.end(l), dof_info, info_box, - std_cxx1x::bind(&OutputCreator::cell, &matrix_integrator, std_cxx1x::_1, std_cxx1x::_2), + std_cxx11::bind(&OutputCreator::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 007066aecb..0879bfc4c3 100644 --- a/tests/multigrid/mg_renumbered_03.cc +++ b/tests/multigrid/mg_renumbered_03.cc @@ -62,7 +62,7 @@ #include #include -#include +#include using namespace dealii; @@ -312,7 +312,7 @@ LaplaceProblem::output_gpl(const MGDoFHandler &dof, MeshWorker::loop, MeshWorker::IntegrationInfoBox > ( dof.begin(l), dof.end(l), dof_info, info_box, - std_cxx1x::bind(&OutputCreator::cell, &matrix_integrator, std_cxx1x::_1, std_cxx1x::_2), + std_cxx11::bind(&OutputCreator::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 31da6440d7..27fe3426ca 100644 --- 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(©, - std_cxx1x::ref(result), - std_cxx1x::_1), + std_cxx11::bind(©, + 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 ca074fec83..cb29a35ebb 100644 --- a/tests/trilinos/assemble_matrix_parallel_01.cc +++ b/tests/trilinos/assemble_matrix_parallel_01.cc @@ -255,9 +255,9 @@ void LaplaceProblem::setup_system () constraints.close (); graph = GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(), - static_cast + static_cast (typename hp::DoFHandler::active_cell_iterator const &)> > - (std_cxx1x::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx1x::_1))); + (std_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); CompressedSimpleSparsityPattern csp (dof_handler.n_dofs(), @@ -356,16 +356,16 @@ void LaplaceProblem::assemble_test () WorkStream:: run (graph, - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::bind (&LaplaceProblem:: local_assemble, this, - std_cxx1x::_1, - std_cxx1x::_2, - std_cxx1x::_3), - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::_1, + std_cxx11::_2, + std_cxx11::_3), + std_cxx11::bind (&LaplaceProblem:: copy_local_to_global, this, - std_cxx1x::_1), + std_cxx11::_1), Assembly::Scratch::Data(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 96cabf815a..7971691307 100644 --- a/tests/trilinos/assemble_matrix_parallel_02.cc +++ b/tests/trilinos/assemble_matrix_parallel_02.cc @@ -247,9 +247,9 @@ void LaplaceProblem::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 + static_cast (FilteredIterator::active_cell_iterator> const &)> > - (std_cxx1x::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx1x::_1))); + (std_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); IndexSet locally_owned = dof_handler.locally_owned_dofs(); { @@ -366,16 +366,16 @@ void LaplaceProblem::assemble_test () WorkStream:: run (graph, - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::bind (&LaplaceProblem:: local_assemble, this, - std_cxx1x::_1, - std_cxx1x::_2, - std_cxx1x::_3), - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::_1, + std_cxx11::_2, + std_cxx11::_3), + std_cxx11::bind (&LaplaceProblem:: copy_local_to_global, this, - std_cxx1x::_1), + std_cxx11::_1), Assembly::Scratch::Data(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 ce114164bd..ed6548e1fa 100644 --- a/tests/trilinos/assemble_matrix_parallel_03.cc +++ b/tests/trilinos/assemble_matrix_parallel_03.cc @@ -248,9 +248,9 @@ void LaplaceProblem::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 + static_cast (FilteredIterator::active_cell_iterator> const &)> > - (std_cxx1x::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx1x::_1))); + (std_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); IndexSet locally_owned = dof_handler.locally_owned_dofs(); { @@ -367,16 +367,16 @@ void LaplaceProblem::assemble_test () WorkStream:: run (graph, - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::bind (&LaplaceProblem:: local_assemble, this, - std_cxx1x::_1, - std_cxx1x::_2, - std_cxx1x::_3), - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::_1, + std_cxx11::_2, + std_cxx11::_3), + std_cxx11::bind (&LaplaceProblem:: copy_local_to_global, this, - std_cxx1x::_1), + std_cxx11::_1), Assembly::Scratch::Data(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 970137a133..167a0dd4d4 100644 --- a/tests/trilinos/assemble_matrix_parallel_04.cc +++ b/tests/trilinos/assemble_matrix_parallel_04.cc @@ -252,9 +252,9 @@ void LaplaceProblem::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 + static_cast (FilteredIterator::active_cell_iterator> const &)> > - (std_cxx1x::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx1x::_1))); + (std_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); TrilinosWrappers::BlockSparsityPattern csp(2,2); std::vector locally_owned(2), relevant_set(2); @@ -382,16 +382,16 @@ void LaplaceProblem::assemble_test () WorkStream:: run (graph, - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::bind (&LaplaceProblem:: local_assemble, this, - std_cxx1x::_1, - std_cxx1x::_2, - std_cxx1x::_3), - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::_1, + std_cxx11::_2, + std_cxx11::_3), + std_cxx11::bind (&LaplaceProblem:: copy_local_to_global, this, - std_cxx1x::_1), + std_cxx11::_1), Assembly::Scratch::Data(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 f39a906e1a..a1cc4b2e26 100644 --- a/tests/trilinos/assemble_matrix_parallel_05.cc +++ b/tests/trilinos/assemble_matrix_parallel_05.cc @@ -250,9 +250,9 @@ void LaplaceProblem::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 + static_cast (FilteredIterator::active_cell_iterator> const &)> > - (std_cxx1x::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx1x::_1))); + (std_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); IndexSet locally_owned = dof_handler.locally_owned_dofs(); { @@ -368,16 +368,16 @@ void LaplaceProblem::assemble_test () WorkStream:: run (graph, - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::bind (&LaplaceProblem:: local_assemble, this, - std_cxx1x::_1, - std_cxx1x::_2, - std_cxx1x::_3), - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::_1, + std_cxx11::_2, + std_cxx11::_3), + std_cxx11::bind (&LaplaceProblem:: copy_local_to_global, this, - std_cxx1x::_1), + std_cxx11::_1), Assembly::Scratch::Data(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 592f21a821..d84daf38c3 100644 --- a/tests/trilinos/assemble_matrix_parallel_06.cc +++ b/tests/trilinos/assemble_matrix_parallel_06.cc @@ -254,9 +254,9 @@ void LaplaceProblem::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 + static_cast (FilteredIterator::active_cell_iterator> const &)> > - (std_cxx1x::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx1x::_1))); + (std_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); TrilinosWrappers::BlockSparsityPattern csp(2,2); std::vector locally_owned(2), relevant_set(2); @@ -383,16 +383,16 @@ void LaplaceProblem::assemble_test () WorkStream:: run (graph, - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::bind (&LaplaceProblem:: local_assemble, this, - std_cxx1x::_1, - std_cxx1x::_2, - std_cxx1x::_3), - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::_1, + std_cxx11::_2, + std_cxx11::_3), + std_cxx11::bind (&LaplaceProblem:: copy_local_to_global, this, - std_cxx1x::_1), + std_cxx11::_1), Assembly::Scratch::Data(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 b798296cdf..568d729cb5 100644 --- a/tests/trilinos/assemble_matrix_parallel_07.cc +++ b/tests/trilinos/assemble_matrix_parallel_07.cc @@ -248,9 +248,9 @@ void LaplaceProblem::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 + static_cast (FilteredIterator::active_cell_iterator> const &)> > - (std_cxx1x::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx1x::_1))); + (std_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); IndexSet locally_owned = dof_handler.locally_owned_dofs(); { @@ -374,16 +374,16 @@ void LaplaceProblem::assemble_test () WorkStream:: run (graph, - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::bind (&LaplaceProblem:: local_assemble, this, - std_cxx1x::_1, - std_cxx1x::_2, - std_cxx1x::_3), - std_cxx1x::bind (&LaplaceProblem:: + std_cxx11::_1, + std_cxx11::_2, + std_cxx11::_3), + std_cxx11::bind (&LaplaceProblem:: copy_local_to_global, this, - std_cxx1x::_1), + std_cxx11::_1), Assembly::Scratch::Data(fe, quadrature), Assembly::Copy::Data (false), 2*multithread_info.n_threads(),