From 61bbff2f409c8566a648a0c599cc5a4f79225254 Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Mon, 27 Mar 2017 11:45:51 -0400 Subject: [PATCH] Replace std_cxx11 and std_cxx1x functions by std ones --- examples/step-13/step-13.cc | 32 +- examples/step-14/step-14.cc | 58 +- examples/step-22/step-22.cc | 4 +- examples/step-27/step-27.cc | 14 +- examples/step-31/step-31.cc | 10 +- examples/step-32/step-32.cc | 100 +- examples/step-33/step-33.cc | 24 +- examples/step-34/step-34.cc | 4 +- examples/step-35/step-35.cc | 10 +- examples/step-37/step-37.cc | 4 +- examples/step-42/step-42.cc | 2 +- examples/step-43/step-43.cc | 10 +- examples/step-44/step-44.cc | 34 +- examples/step-51/step-51.cc | 8 +- examples/step-52/step-52.cc | 28 +- examples/step-53/step-53.cc | 18 +- examples/step-9/step-9.cc | 38 +- include/deal.II/base/aligned_vector.h | 20 +- include/deal.II/base/data_out_base.h | 40 +- include/deal.II/base/function.h | 14 +- include/deal.II/base/function.templates.h | 4 +- include/deal.II/base/function_lib.h | 16 +- include/deal.II/base/function_spherical.h | 14 +- include/deal.II/base/geometric_utilities.h | 8 +- include/deal.II/base/graph_coloring.h | 8 +- include/deal.II/base/logstream.h | 4 +- include/deal.II/base/memory_consumption.h | 39 +- include/deal.II/base/mg_level_object.h | 13 +- include/deal.II/base/parallel.h | 70 +- include/deal.II/base/parameter_handler.h | 11 +- include/deal.II/base/point.h | 2 +- include/deal.II/base/polynomial.h | 4 +- include/deal.II/base/polynomials_abf.h | 2 +- include/deal.II/base/quadrature_point_data.h | 20 +- include/deal.II/base/std_cxx11/array.h | 13 - include/deal.II/base/std_cxx11/bind.h | 41 - .../base/std_cxx11/condition_variable.h | 16 - include/deal.II/base/std_cxx11/function.h | 12 - include/deal.II/base/std_cxx11/iterator.h | 14 - include/deal.II/base/std_cxx11/mutex.h | 14 - include/deal.II/base/std_cxx11/shared_ptr.h | 17 - include/deal.II/base/std_cxx11/thread.h | 17 - include/deal.II/base/std_cxx11/tuple.h | 33 - include/deal.II/base/std_cxx11/type_traits.h | 51 - include/deal.II/base/std_cxx11/unique_ptr.h | 70 - include/deal.II/base/synchronous_iterator.h | 68 +- include/deal.II/base/table_indices.h | 4 +- include/deal.II/base/thread_management.h | 1204 ++++++++--------- include/deal.II/base/time_stepping.h | 124 +- .../deal.II/base/time_stepping.templates.h | 43 +- include/deal.II/base/work_stream.h | 84 +- include/deal.II/distributed/shared_tria.h | 4 +- include/deal.II/distributed/tria.h | 35 +- include/deal.II/distributed/tria_base.h | 5 +- include/deal.II/dofs/dof_handler.h | 4 +- include/deal.II/fe/fe_p1nc.h | 2 +- include/deal.II/fe/fe_series.h | 14 +- include/deal.II/fe/fe_system.h | 2 +- include/deal.II/fe/fe_values.h | 8 +- include/deal.II/fe/mapping.h | 4 +- include/deal.II/fe/mapping_fe_field.h | 4 +- include/deal.II/fe/mapping_manifold.h | 2 +- include/deal.II/fe/mapping_q.h | 8 +- include/deal.II/fe/mapping_q1_eulerian.h | 6 +- include/deal.II/fe/mapping_q_eulerian.h | 4 +- include/deal.II/fe/mapping_q_generic.h | 7 +- include/deal.II/grid/cell_id.h | 8 +- include/deal.II/grid/filtered_iterator.h | 2 +- include/deal.II/grid/grid_generator.h | 5 +- include/deal.II/grid/grid_tools.h | 2 +- include/deal.II/grid/tria.h | 14 +- include/deal.II/grid/tria_boundary.h | 2 +- include/deal.II/hp/fe_collection.h | 5 +- include/deal.II/hp/fe_values.h | 4 +- include/deal.II/hp/mapping_collection.h | 4 +- include/deal.II/hp/q_collection.h | 8 +- include/deal.II/lac/block_vector.h | 2 +- .../lac/chunk_sparse_matrix.templates.h | 28 +- include/deal.II/lac/cuda_vector.h | 4 +- include/deal.II/lac/filtered_matrix.h | 2 +- include/deal.II/lac/iterative_inverse.h | 8 +- .../deal.II/lac/la_parallel_block_vector.h | 6 +- .../lac/la_parallel_block_vector.templates.h | 2 +- include/deal.II/lac/la_parallel_vector.h | 20 +- .../lac/la_parallel_vector.templates.h | 14 +- include/deal.II/lac/la_vector.h | 6 +- include/deal.II/lac/la_vector.templates.h | 2 +- include/deal.II/lac/lapack_full_matrix.h | 6 +- include/deal.II/lac/matrix_block.h | 5 +- include/deal.II/lac/petsc_block_vector.h | 2 +- include/deal.II/lac/petsc_matrix_base.h | 6 +- .../deal.II/lac/petsc_parallel_block_vector.h | 2 +- include/deal.II/lac/petsc_parallel_vector.h | 2 +- include/deal.II/lac/petsc_solver.h | 7 +- include/deal.II/lac/petsc_vector.h | 2 +- include/deal.II/lac/precondition.h | 12 +- include/deal.II/lac/read_write_vector.h | 26 +- .../deal.II/lac/read_write_vector.templates.h | 26 +- .../deal.II/lac/relaxation_block.templates.h | 4 +- include/deal.II/lac/slepc_solver.h | 4 +- .../lac/slepc_spectral_transformation.h | 3 +- include/deal.II/lac/solver.h | 42 +- include/deal.II/lac/solver_cg.h | 12 +- include/deal.II/lac/solver_gmres.h | 16 +- include/deal.II/lac/sparse_matrix.templates.h | 82 +- include/deal.II/lac/trilinos_block_vector.h | 4 +- .../trilinos_epetra_communication_pattern.h | 6 +- include/deal.II/lac/trilinos_epetra_vector.h | 11 +- include/deal.II/lac/trilinos_precondition.h | 11 +- include/deal.II/lac/trilinos_solver.h | 11 +- include/deal.II/lac/trilinos_sparse_matrix.h | 13 +- .../deal.II/lac/trilinos_sparsity_pattern.h | 9 +- include/deal.II/lac/trilinos_vector.h | 7 +- include/deal.II/lac/trilinos_vector_base.h | 5 +- include/deal.II/lac/vector.h | 4 +- .../deal.II/lac/vector_operations_internal.h | 8 +- include/deal.II/lac/vector_space_vector.h | 7 +- include/deal.II/lac/vector_type_traits.h | 8 +- include/deal.II/matrix_free/dof_info.h | 7 +- .../deal.II/matrix_free/dof_info.templates.h | 6 +- include/deal.II/matrix_free/fe_evaluation.h | 2 +- .../matrix_free/mapping_info.templates.h | 2 +- include/deal.II/matrix_free/matrix_free.h | 86 +- include/deal.II/matrix_free/operators.h | 54 +- include/deal.II/meshworker/dof_info.h | 3 +- include/deal.II/meshworker/integration_info.h | 43 +- .../meshworker/integration_info.templates.h | 2 +- include/deal.II/meshworker/local_integrator.h | 2 +- include/deal.II/meshworker/local_results.h | 3 +- include/deal.II/meshworker/loop.h | 46 +- include/deal.II/multigrid/mg_matrix.h | 7 +- include/deal.II/multigrid/mg_transfer.h | 6 +- include/deal.II/multigrid/mg_transfer_block.h | 6 +- .../deal.II/multigrid/mg_transfer_component.h | 7 +- .../multigrid/sparse_matrix_collection.h | 3 +- include/deal.II/numerics/data_out.h | 4 +- include/deal.II/numerics/data_out_dof_data.h | 32 +- include/deal.II/numerics/data_out_faces.h | 2 +- include/deal.II/numerics/data_out_rotation.h | 2 +- .../numerics/derivative_approximation.h | 1 - .../numerics/error_estimator.templates.h | 10 +- .../numerics/matrix_creator.templates.h | 128 +- include/deal.II/numerics/time_dependent.h | 22 +- include/deal.II/numerics/vector_tools.h | 12 +- .../deal.II/numerics/vector_tools.templates.h | 34 +- include/deal.II/opencascade/boundary_lib.h | 2 +- include/deal.II/opencascade/utilities.h | 8 +- source/base/data_out_base.cc | 228 ++-- source/base/data_out_base.inst.in | 24 +- source/base/function_lib.cc | 6 +- source/base/function_spherical.cc | 26 +- source/base/geometric_utilities.cc | 14 +- source/base/parameter_handler.cc | 10 +- source/base/polynomial.cc | 20 +- source/base/quadrature_lib.cc | 11 +- source/base/tensor_product_polynomials.cc | 9 +- source/distributed/grid_refinement.cc | 8 +- source/distributed/shared_tria.cc | 2 +- source/distributed/solution_transfer.cc | 28 +- source/distributed/tria.cc | 18 +- source/dofs/dof_tools.cc | 2 +- source/dofs/dof_tools_constraints.cc | 68 +- source/fe/fe.cc | 6 +- source/fe/fe_p1nc.cc | 10 +- source/fe/fe_q_bubbles.cc | 4 +- source/fe/fe_system.cc | 2 +- source/fe/fe_tools.cc | 20 +- source/fe/fe_tools_interpolate.cc | 10 +- source/fe/fe_values.cc | 20 +- source/fe/mapping.cc | 4 +- source/fe/mapping_fe_field.cc | 8 +- source/fe/mapping_manifold.cc | 4 +- source/fe/mapping_q.cc | 6 +- source/fe/mapping_q1.cc | 4 +- source/fe/mapping_q1_eulerian.cc | 10 +- source/fe/mapping_q_eulerian.cc | 6 +- source/fe/mapping_q_generic.cc | 32 +- source/grid/grid_generator.cc | 6 +- source/grid/grid_generator.inst.in | 2 +- source/grid/grid_in.cc | 2 +- source/grid/grid_out.cc | 6 +- source/grid/grid_reordering.cc | 1 - source/grid/grid_tools.cc | 26 +- source/grid/grid_tools.inst.in | 2 +- source/grid/tria.cc | 27 +- source/grid/tria_accessor.cc | 4 +- source/grid/tria_boundary.cc | 2 +- source/grid/tria_objects.cc | 3 +- source/hp/dof_handler.cc | 39 +- source/hp/fe_collection.cc | 2 +- source/hp/fe_values.cc | 2 +- source/hp/mapping_collection.cc | 4 +- source/lac/cuda_vector.cu | 2 +- source/lac/sparsity_pattern.cc | 2 +- .../trilinos_epetra_communication_pattern.cc | 4 +- source/lac/trilinos_epetra_vector.cc | 4 +- source/lac/trilinos_solver.cc | 8 +- source/lac/trilinos_sparse_matrix.cc | 22 +- source/lac/trilinos_sparsity_pattern.cc | 18 +- source/lac/trilinos_vector.cc | 2 +- source/multigrid/mg_transfer_block.cc | 16 +- source/multigrid/mg_transfer_component.cc | 10 +- source/multigrid/mg_transfer_internal.cc | 4 +- source/multigrid/mg_transfer_prebuilt.cc | 4 +- source/numerics/data_out.cc | 22 +- source/numerics/data_out_dof_data.cc | 28 +- source/numerics/data_out_dof_data.inst.in | 2 +- source/numerics/data_out_faces.cc | 12 +- source/numerics/data_out_rotation.cc | 12 +- source/numerics/derivative_approximation.cc | 30 +- source/numerics/error_estimator_1d.cc | 2 +- source/numerics/point_value_history.cc | 12 +- source/numerics/time_dependent.cc | 15 +- .../numerics/vector_tools_project_qp.inst.in | 2 +- .../vector_tools_project_qpmf.inst.in | 8 +- source/opencascade/boundary_lib.cc | 10 +- source/opencascade/utilities.cc | 32 +- tests/arpack/step-36_parpack_mf.cc | 2 +- tests/base/data_out_base.cc | 2 +- tests/base/data_out_base_dx.cc | 4 +- tests/base/data_out_base_eps.cc | 4 +- tests/base/data_out_base_gmv.cc | 2 +- tests/base/data_out_base_gnuplot.cc | 2 +- tests/base/data_out_base_gnuplot_labels.cc | 2 +- tests/base/data_out_base_povray.cc | 4 +- tests/base/data_out_base_tecplot.cc | 2 +- tests/base/data_out_base_tecplot_bin.cc | 2 +- tests/base/data_out_base_vtk.cc | 2 +- tests/base/data_out_base_vtk_cycle.cc | 2 +- tests/base/data_out_base_vtk_time.cc | 2 +- .../base/data_out_base_vtk_time_and_cycle.cc | 2 +- tests/base/data_out_base_vtu.cc | 2 +- .../data_out_base_vtu_compression_levels.cc | 2 +- tests/base/data_out_base_vtu_cycle.cc | 2 +- tests/base/data_out_base_vtu_time.cc | 2 +- .../base/data_out_base_vtu_time_and_cycle.cc | 2 +- tests/base/data_out_reader_01.cc | 2 +- tests/base/function_parser_04.cc | 6 +- tests/base/functions_04.cc | 2 +- tests/base/functions_05.cc | 6 +- tests/base/functions_06.cc | 6 +- tests/base/functions_10.cc | 8 +- tests/base/functions_11.cc | 12 +- tests/base/functions_constant_function_00.cc | 2 +- tests/base/functions_singularity.cc | 2 +- tests/base/functions_spherical_01.cc | 16 +- tests/base/functions_spherical_02.cc | 16 +- tests/base/geometric_utilities_01.cc | 12 +- tests/base/geometric_utilities_02.cc | 4 +- tests/base/graph_coloring_01.cc | 2 +- tests/base/graph_coloring_02.cc | 2 +- tests/base/graph_coloring_02a.cc | 2 +- tests/base/graph_coloring_03.cc | 2 +- tests/base/graph_coloring_04.cc | 2 +- tests/base/graph_coloring_05.cc | 2 +- tests/base/graph_coloring_06.cc | 2 +- tests/base/memory_consumption_03.cc | 4 +- tests/base/time_stepping_01.cc | 12 +- tests/base/time_stepping_02.cc | 4 +- tests/base/unique_ptr_01.cc | 8 +- tests/base/work_stream_03.cc | 6 +- tests/base/work_stream_03_graph.cc | 8 +- tests/base/work_stream_04.cc | 6 +- tests/base/work_stream_05_graph.cc | 2 +- tests/bits/fe_tools_05.cc | 6 +- tests/bits/fe_tools_06.cc | 6 +- tests/bits/fe_tools_06b.cc | 6 +- tests/bits/fe_tools_06c.cc | 2 +- tests/bits/fe_tools_06d.cc | 2 +- tests/bits/fe_tools_07.cc | 6 +- tests/bits/fe_tools_08.cc | 6 +- tests/bits/fe_tools_common.h | 2 +- tests/bits/step-51.cc | 8 +- tests/bits/step-51p.cc | 8 +- tests/dofs/dof_renumbering_02.cc | 8 +- tests/dofs/dof_renumbering_03.cc | 4 +- tests/dofs/dof_renumbering_04.cc | 4 +- tests/dofs/dof_renumbering_05.cc | 4 +- tests/dofs/dof_renumbering_06.cc | 4 +- tests/dofs/dof_renumbering_07.cc | 4 +- tests/dofs/dof_renumbering_08.cc | 4 +- tests/dofs/dof_renumbering_zorder_01.cc | 4 +- tests/dofs/dof_renumbering_zorder_02.cc | 4 +- tests/fe/fe_q_dg0.cc | 4 +- tests/fe/fe_values_function_manifold.cc | 12 +- tests/grid/filtered_iterator.cc | 12 +- tests/grid/filtered_iterator_02.cc | 12 +- tests/grid/grid_parallelepiped_05.cc | 2 +- tests/grid/grid_tools_halo_layer_01.cc | 2 +- tests/grid/grid_tools_halo_layer_02.cc | 2 +- tests/grid/grid_tools_halo_layer_03.cc | 2 +- tests/grid/grid_tools_halo_layer_04.cc | 2 +- tests/grid/grid_tools_halo_layer_05.cc | 2 +- tests/grid/refinement_listener_02.cc | 52 +- tests/grid/refinement_listener_03.cc | 64 +- tests/grid/rotate_01.cc | 4 +- tests/grid/twisted_parallelepiped_01.cc | 4 +- tests/grid/twisted_parallelepiped_02.cc | 4 +- tests/hp/distribute_dofs_linear_time.cc | 12 +- tests/hp/step-27.cc | 8 +- tests/integrators/cells_and_faces_01.cc | 14 +- tests/integrators/functional_01.cc | 14 +- tests/integrators/mesh_worker_01.cc | 14 +- tests/integrators/mesh_worker_02.cc | 6 +- tests/integrators/mesh_worker_03.cc | 14 +- tests/integrators/mesh_worker_1d_dg.cc | 14 +- tests/integrators/mesh_worker_matrix_01.cc | 8 +- tests/lac/block_vector_iterator.cc | 8 +- tests/lac/complex_block_vector_iterator.cc | 8 +- tests/lac/constraints_block_01.cc | 4 +- tests/lac/solver_signals.cc | 20 +- ...ector_operations_parallel_for_start_end.cc | 2 +- ...or_operations_parallel_reduce_start_end.cc | 2 +- tests/manifold/spherical_manifold_02.cc | 4 +- tests/mappings/mapping_q_convergence.cc | 6 +- tests/mappings/mapping_q_manifold_01.cc | 6 +- .../mappings/mapping_q_mixed_manifolds_01.cc | 2 +- .../mappings/mapping_q_mixed_manifolds_02.cc | 2 +- .../estimate_condition_number_mass.cc | 8 +- tests/matrix_free/laplace_operator_01.cc | 2 +- tests/matrix_free/laplace_operator_02.cc | 6 +- tests/matrix_free/mass_operator_01.cc | 2 +- tests/matrix_free/mass_operator_02.cc | 2 +- tests/matrix_free/mass_operator_03.cc | 2 +- tests/matrix_free/mass_operator_04.cc | 6 +- tests/matrix_free/matrix_vector_12.cc | 8 +- tests/matrix_free/matrix_vector_13.cc | 8 +- tests/matrix_free/matrix_vector_20.cc | 8 +- tests/matrix_free/matrix_vector_21.cc | 8 +- tests/matrix_free/matrix_vector_22.cc | 8 +- tests/matrix_free/matrix_vector_23.cc | 8 +- tests/matrix_free/matrix_vector_mf.h | 8 +- .../matrix_free/matrix_vector_stokes_base.cc | 4 +- tests/matrix_free/parallel_multigrid_02.cc | 4 +- .../parallel_multigrid_adaptive_02.cc | 4 +- .../parallel_multigrid_adaptive_04.cc | 4 +- .../mpi/cell_weights_01_back_and_forth_01.cc | 12 +- .../mpi/cell_weights_01_back_and_forth_02.cc | 6 +- tests/mpi/cell_weights_02.cc | 6 +- tests/mpi/cell_weights_03.cc | 6 +- tests/mpi/cell_weights_04.cc | 6 +- tests/mpi/cell_weights_05.cc | 6 +- tests/mpi/cell_weights_06.cc | 6 +- tests/mpi/crash_06.cc | 16 +- tests/mpi/fe_tools_extrapolate_common.h | 15 +- tests/mpi/mesh_worker_01.cc | 12 +- tests/mpi/mesh_worker_02.cc | 12 +- tests/mpi/mesh_worker_03.cc | 12 +- tests/mpi/mesh_worker_04.cc | 12 +- tests/mpi/mesh_worker_05.cc | 12 +- tests/mpi/mesh_worker_matrix_01.cc | 8 +- tests/mpi/tria_signals_02.cc | 14 +- tests/mpi/tria_signals_03.cc | 14 +- tests/mpi/tria_signals_04.cc | 14 +- tests/mpi/tria_signals_05.cc | 14 +- tests/mpi/tria_signals_06.cc | 12 +- tests/multigrid/mg_renumbered_02.cc | 4 +- tests/multigrid/mg_renumbered_03.cc | 4 +- tests/numerics/assemble_matrix_parallel_01.cc | 24 +- tests/numerics/assemble_matrix_parallel_02.cc | 44 +- tests/numerics/assemble_matrix_parallel_03.cc | 24 +- tests/numerics/assemble_matrix_parallel_04.cc | 44 +- tests/numerics/data_out_04.cc | 26 +- tests/numerics/data_out_faces_04.cc | 22 +- tests/numerics/data_out_rotation_04.cc | 22 +- tests/numerics/project_parallel_qpmf_common.h | 2 +- tests/opencascade/closest_point_to_shape.cc | 10 +- tests/opencascade/iges_describe.cc | 14 +- tests/opencascade/step_describe.cc | 14 +- tests/petsc/block_vector_iterator_03.cc | 6 +- ...-standard_tensors-material_push_forward.cc | 34 +- .../step-44-standard_tensors-spatial.cc | 34 +- tests/physics/step-44.cc | 34 +- tests/quick_tests/tbb.cc | 6 +- tests/trilinos/assemble_matrix_parallel_01.cc | 24 +- tests/trilinos/assemble_matrix_parallel_02.cc | 24 +- tests/trilinos/assemble_matrix_parallel_03.cc | 24 +- tests/trilinos/assemble_matrix_parallel_04.cc | 24 +- tests/trilinos/assemble_matrix_parallel_05.cc | 24 +- tests/trilinos/assemble_matrix_parallel_06.cc | 24 +- tests/trilinos/assemble_matrix_parallel_07.cc | 24 +- tests/trilinos/block_vector_iterator_03.cc | 6 +- 382 files changed, 2954 insertions(+), 3250 deletions(-) diff --git a/examples/step-13/step-13.cc b/examples/step-13/step-13.cc index ce256ead6c..0ee0a64f93 100644 --- a/examples/step-13/step-13.cc +++ b/examples/step-13/step-13.cc @@ -777,20 +777,20 @@ namespace Step13 WorkStream::run(dof_handler.begin_active(), dof_handler.end(), - std_cxx11::bind(&Solver::local_assemble_matrix, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind(&Solver::copy_local_to_global, - this, - std_cxx11::_1, - std_cxx11::ref(linear_system)), + std::bind(&Solver::local_assemble_matrix, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind(&Solver::copy_local_to_global, + this, + std::placeholders::_1, + std::ref(linear_system)), AssemblyScratchData(*fe, *quadrature), AssemblyCopyData()); linear_system.hanging_node_constraints.condense (linear_system.matrix); - // The syntax above using std_cxx11::bind requires + // The syntax above using std::bind requires // some explanation. There are multiple version of // WorkStream::run that expect different arguments. In step-9, // we used one version that took a pair of iterators, a pair of @@ -824,7 +824,7 @@ namespace Step13 // typical way to generate such function objects is using // std::bind (or, if the compiler is too old, a // replacement for it, which we generically call - // std_cxx11::bind) which takes a pointer to a + // std::bind) which takes a pointer to a // (member) function and then binds individual arguments // to fixed values. For example, you can create a function that // takes an iterator, a scratch object and a copy object by @@ -840,9 +840,9 @@ namespace Step13 // that can then be filled by WorkStream::run(). // // There remains the question of what the - // std_cxx11::_1, std_cxx11::_2, etc., + // std::placeholders::_1, std::placeholders::_2, etc., // mean. (These arguments are called placeholders.) The - // idea of using std_cxx11::bind in the first of + // idea of using std::bind in the first of // the two cases above is that it produces an object that can be // called with three arguments. But how are the three arguments // the function object is being called with going to be @@ -855,9 +855,9 @@ namespace Step13 // games in other circumstances. Consider, for example, having a // function void f(double x, double y). Then, // creating a variable p of type - // std_cxx11::function@ and - // initializing p=std_cxx11::bind(&f, std_cxx11::_2, - // std_cxx11::_1) then calling p(1,2) will + // std::function@ and + // initializing p=std::bind(&f, std::placeholders::_2, + // std::placeholders::_1) then calling p(1,2) will // result in calling f(2,1). // // @note Once deal.II can rely on every compiler being able to diff --git a/examples/step-14/step-14.cc b/examples/step-14/step-14.cc index 6d039dac53..d98966313f 100644 --- a/examples/step-14/step-14.cc +++ b/examples/step-14/step-14.cc @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -55,6 +54,7 @@ #include #include #include +#include // The last step is as in all previous programs: namespace Step14 @@ -569,15 +569,15 @@ namespace Step14 WorkStream::run(dof_handler.begin_active(), dof_handler.end(), - std_cxx11::bind(&Solver::local_assemble_matrix, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind(&Solver::copy_local_to_global, - this, - std_cxx11::_1, - std_cxx11::ref(linear_system)), + std::bind(&Solver::local_assemble_matrix, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind(&Solver::copy_local_to_global, + this, + std::placeholders::_1, + std::ref(linear_system)), AssemblyScratchData(*fe, *quadrature), AssemblyCopyData()); linear_system.hanging_node_constraints.condense (linear_system.matrix); @@ -1958,7 +1958,7 @@ namespace Step14 // in step-9: void estimate_error (Vector &error_indicators) const; - void estimate_on_one_cell (const SynchronousIterators::iterator> > &cell_and_error, WeightedResidualScratchData &scratch_data, WeightedResidualCopyData ©_data, @@ -1969,7 +1969,7 @@ namespace Step14 // interiors, on those faces that have no hanging nodes, and on those // faces with hanging nodes, respectively: void - integrate_over_cell (const SynchronousIterators::iterator> > &cell_and_error, const Vector &primal_solution, const Vector &dual_weights, @@ -2369,7 +2369,7 @@ namespace Step14 .get_triangulation().n_active_cells()); typedef - std_cxx11::tuple::iterator> + std::tuple::iterator> IteratorTuple; SynchronousIterators @@ -2381,13 +2381,13 @@ namespace Step14 WorkStream::run(cell_and_error_begin, cell_and_error_end, - std_cxx11::bind(&WeightedResidual::estimate_on_one_cell, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3, - std_cxx11::ref(face_integrals)), - std_cxx11::function(), + std::bind(&WeightedResidual::estimate_on_one_cell, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3, + std::ref(face_integrals)), + std::function(), WeightedResidualScratchData (*DualSolver::fe, *DualSolver::quadrature, *DualSolver::face_quadrature, @@ -2430,7 +2430,7 @@ namespace Step14 template void WeightedResidual:: - estimate_on_one_cell (const SynchronousIterators::iterator> > &cell_and_error, WeightedResidualScratchData &scratch_data, WeightedResidualCopyData ©_data, @@ -2444,7 +2444,7 @@ namespace Step14 // First task on each cell is to compute the cell residual // contributions of this cell, and put them into the // error_indicators variable: - active_cell_iterator cell = std_cxx11::get<0>(*cell_and_error); + active_cell_iterator cell = std::get<0>(*cell_and_error); integrate_over_cell (cell_and_error, scratch_data.primal_solution, @@ -2523,7 +2523,7 @@ namespace Step14 // the cell terms: template void WeightedResidual:: - integrate_over_cell (const SynchronousIterators::iterator> > &cell_and_error, const Vector &primal_solution, const Vector &dual_weights, @@ -2533,7 +2533,7 @@ namespace Step14 // error estimation formula: first get the right hand side and Laplacian // of the numerical solution at the quadrature points for the cell // residual, - cell_data.fe_values.reinit (std_cxx11::get<0>(*cell_and_error)); + cell_data.fe_values.reinit (std::get<0>(*cell_and_error)); cell_data.right_hand_side ->value_list (cell_data.fe_values.get_quadrature_points(), cell_data.rhs_values); @@ -2551,7 +2551,7 @@ namespace Step14 sum += ((cell_data.rhs_values[p]+cell_data.cell_laplacians[p]) * cell_data.dual_weights[p] * cell_data.fe_values.JxW (p)); - *(std_cxx11::get<1>(*cell_and_error)) += sum; + *(std::get<1>(*cell_and_error)) += sum; } @@ -2807,7 +2807,7 @@ namespace Step14 // side, domain, boundary values, etc. The pointer needed here defaults // to the Null pointer, i.e. you will have to set it in actual instances // of this object to make it useful. - std_cxx11::unique_ptr > data; + std::unique_ptr > data; // Since we allow to use different refinement criteria (global // refinement, refinement by the Kelly error indicator, possibly with a @@ -2827,7 +2827,7 @@ namespace Step14 // Next, an object that describes the dual functional. It is only needed // if the dual weighted residual refinement is chosen, and also defaults // to a Null pointer. - std_cxx11::unique_ptr > + std::unique_ptr > dual_functional; // Then a list of evaluation objects. Its default value is empty, @@ -2839,7 +2839,7 @@ namespace Step14 // pointer is zero, but you have to set it to some other value if you // want to use the weighted_kelly_indicator refinement // criterion. - std_cxx11::unique_ptr > kelly_weight; + std::unique_ptr > kelly_weight; // Finally, we have a variable that denotes the maximum number of // degrees of freedom we allow for the (primal) discretization. If it is @@ -2889,7 +2889,7 @@ namespace Step14 // Next, select one of the classes implementing different refinement // criteria. - std_cxx11::unique_ptr > solver; + std::unique_ptr > solver; switch (descriptor.refinement_criterion) { case ProblemDescription::dual_weighted_error_estimator: diff --git a/examples/step-22/step-22.cc b/examples/step-22/step-22.cc index a92abd80f9..869be04b86 100644 --- a/examples/step-22/step-22.cc +++ b/examples/step-22/step-22.cc @@ -149,7 +149,7 @@ namespace Step22 // in how many places a preconditioner object is still referenced, it can // never create a memory leak, and can never produce a dangling pointer to // an already destroyed object: - std_cxx11::shared_ptr::type> A_preconditioner; + std::shared_ptr::type> A_preconditioner; }; // @sect3{Boundary values and right hand side} @@ -715,7 +715,7 @@ namespace Step22 std::cout << " Computing preconditioner..." << std::endl << std::flush; A_preconditioner - = std_cxx11::shared_ptr::type>(new typename InnerPreconditioner::type()); + = std::shared_ptr::type>(new typename InnerPreconditioner::type()); A_preconditioner->initialize (system_matrix.block(0,0), typename InnerPreconditioner::type::AdditionalData()); diff --git a/examples/step-27/step-27.cc b/examples/step-27/step-27.cc index 1829c33abd..43cf9f97dc 100644 --- a/examples/step-27/step-27.cc +++ b/examples/step-27/step-27.cc @@ -111,7 +111,7 @@ namespace Step27 hp::QCollection face_quadrature_collection; hp::QCollection fourier_q_collection; - std_cxx11::shared_ptr > fourier; + std::shared_ptr > fourier; std::vector ln_k; Table > fourier_coefficients; @@ -235,9 +235,9 @@ namespace Step27 fourier_q_collection.push_back(quadrature); // Now we are ready to set-up the FESeries::Fourier object - fourier = std_cxx11::make_shared >(N, - fe_collection, - fourier_q_collection); + fourier = std::make_shared >(N, + fe_collection, + fourier_q_collection); // We need to resize the matrix of fourier coefficients according to the // number of modes N. @@ -756,9 +756,9 @@ namespace Step27 // k}|$ and thereby need to use VectorTools::Linfty_norm: std::pair, std::vector > res = FESeries::process_coefficients(fourier_coefficients, - std_cxx11::bind(&LaplaceProblem::predicate, - this, - std_cxx11::_1), + std::bind(&LaplaceProblem::predicate, + this, + std::placeholders::_1), VectorTools::Linfty_norm); Assert (res.first.size() == res.second.size(), diff --git a/examples/step-31/step-31.cc b/examples/step-31/step-31.cc index e978df2b04..b276617ce6 100644 --- a/examples/step-31/step-31.cc +++ b/examples/step-31/step-31.cc @@ -541,8 +541,8 @@ namespace Step31 double old_time_step; unsigned int timestep_number; - std_cxx11::shared_ptr Amg_preconditioner; - std_cxx11::shared_ptr Mp_preconditioner; + std::shared_ptr Amg_preconditioner; + std::shared_ptr Mp_preconditioner; bool rebuild_stokes_matrix; bool rebuild_temperature_matrices; @@ -1185,7 +1185,7 @@ namespace Step31 assemble_stokes_preconditioner (); - Amg_preconditioner = std_cxx11::shared_ptr + Amg_preconditioner = std::shared_ptr (new TrilinosWrappers::PreconditionAMG()); std::vector > constant_modes; @@ -1221,7 +1221,7 @@ namespace Step31 // (IC) factorization preconditioner, which is designed for symmetric // matrices. We could have also chosen an SSOR preconditioner with // relaxation factor around 1.2, but IC is cheaper for our example. We - // wrap the preconditioners into a std_cxx11::shared_ptr + // wrap the preconditioners into a std::shared_ptr // pointer, which makes it easier to recreate the preconditioner next time // around since we do not have to care about destroying the previously // used object. @@ -1232,7 +1232,7 @@ namespace Step31 Amg_preconditioner->initialize(stokes_preconditioner_matrix.block(0,0), amg_data); - Mp_preconditioner = std_cxx11::shared_ptr + Mp_preconditioner = std::shared_ptr (new TrilinosWrappers::PreconditionIC()); Mp_preconditioner->initialize(stokes_preconditioner_matrix.block(1,1)); diff --git a/examples/step-32/step-32.cc b/examples/step-32/step-32.cc index 0376cc7c31..1479a59274 100644 --- a/examples/step-32/step-32.cc +++ b/examples/step-32/step-32.cc @@ -911,9 +911,9 @@ namespace Step32 double old_time_step; unsigned int timestep_number; - std_cxx11::shared_ptr Amg_preconditioner; - std_cxx11::shared_ptr Mp_preconditioner; - std_cxx11::shared_ptr T_preconditioner; + std::shared_ptr Amg_preconditioner; + std::shared_ptr Mp_preconditioner; + std::shared_ptr T_preconditioner; bool rebuild_stokes_matrix; bool rebuild_stokes_preconditioner; @@ -2234,12 +2234,12 @@ namespace Step32 // specific signatures: three arguments in the first and one // argument in the latter case (see the documentation of the // WorkStream::run function for the meaning of these arguments). - // Note how we use the construct std_cxx11::bind to + // Note how we use the construct std::bind to // create a function object that satisfies this requirement. It uses - // placeholders std_cxx11::_1, std_cxx11::_2, - // std_cxx11::_3 for the local assembly function that specify + // placeholders std::placeholders::_1, std::placeholders::_2, + // std::placeholders::_3 for the local assembly function that specify // cell, scratch data, and copy data, as well as the placeholder - // std_cxx11::_1 for the copy function that expects the + // std::placeholders::_1 for the copy function that expects the // data to be written into the global matrix (for placeholder // arguments, also see the discussion in step-13's // assemble_linear_system() function). On the other @@ -2281,16 +2281,16 @@ namespace Step32 stokes_dof_handler.begin_active()), CellFilter (IteratorFilters::LocallyOwnedCell(), stokes_dof_handler.end()), - std_cxx11::bind (&BoussinesqFlowProblem:: - local_assemble_stokes_preconditioner, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind (&BoussinesqFlowProblem:: - copy_local_to_global_stokes_preconditioner, - this, - std_cxx11::_1), + std::bind (&BoussinesqFlowProblem:: + local_assemble_stokes_preconditioner, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind (&BoussinesqFlowProblem:: + copy_local_to_global_stokes_preconditioner, + this, + std::placeholders::_1), Assembly::Scratch:: StokesPreconditioner (stokes_fe, quadrature_formula, mapping, @@ -2472,16 +2472,16 @@ namespace Step32 stokes_dof_handler.begin_active()), CellFilter (IteratorFilters::LocallyOwnedCell(), stokes_dof_handler.end()), - std_cxx11::bind (&BoussinesqFlowProblem:: - local_assemble_stokes_system, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind (&BoussinesqFlowProblem:: - copy_local_to_global_stokes_system, - this, - std_cxx11::_1), + std::bind (&BoussinesqFlowProblem:: + local_assemble_stokes_system, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind (&BoussinesqFlowProblem:: + copy_local_to_global_stokes_system, + this, + std::placeholders::_1), Assembly::Scratch:: StokesSystem (stokes_fe, mapping, quadrature_formula, (update_values | @@ -2593,16 +2593,16 @@ namespace Step32 temperature_dof_handler.begin_active()), CellFilter (IteratorFilters::LocallyOwnedCell(), temperature_dof_handler.end()), - std_cxx11::bind (&BoussinesqFlowProblem:: - local_assemble_temperature_matrix, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind (&BoussinesqFlowProblem:: - copy_local_to_global_temperature_matrix, - this, - std_cxx11::_1), + std::bind (&BoussinesqFlowProblem:: + local_assemble_temperature_matrix, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind (&BoussinesqFlowProblem:: + copy_local_to_global_temperature_matrix, + this, + std::placeholders::_1), Assembly::Scratch:: TemperatureMatrix (temperature_fe, mapping, quadrature_formula), Assembly::CopyData:: @@ -2889,19 +2889,19 @@ namespace Step32 temperature_dof_handler.begin_active()), CellFilter (IteratorFilters::LocallyOwnedCell(), temperature_dof_handler.end()), - std_cxx11::bind (&BoussinesqFlowProblem:: - local_assemble_temperature_rhs, - this, - global_T_range, - maximal_velocity, - global_entropy_variation, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind (&BoussinesqFlowProblem:: - copy_local_to_global_temperature_rhs, - this, - std_cxx11::_1), + std::bind (&BoussinesqFlowProblem:: + local_assemble_temperature_rhs, + this, + global_T_range, + maximal_velocity, + global_entropy_variation, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind (&BoussinesqFlowProblem:: + copy_local_to_global_temperature_rhs, + this, + std::placeholders::_1), Assembly::Scratch:: TemperatureRHS (temperature_fe, stokes_fe, mapping, quadrature_formula), diff --git a/examples/step-33/step-33.cc b/examples/step-33/step-33.cc index c88c233ed5..3629f3cfe6 100644 --- a/examples/step-33/step-33.cc +++ b/examples/step-33/step-33.cc @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -81,6 +80,7 @@ DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include #include +#include // To end this section, introduce everything in the dealii library into the // namespace into which the contents of this program will go: @@ -220,7 +220,7 @@ namespace Step33 template static void compute_flux_matrix (const InputVector &W, - std_cxx11::array , EulerEquations::n_components > &flux) { @@ -264,12 +264,12 @@ namespace Step33 const InputVector &Wplus, const InputVector &Wminus, const double alpha, - std_cxx11::array + std::array &normal_flux) { - std_cxx11::array - , + std::array + , EulerEquations::n_components > iflux, oflux; compute_flux_matrix (Wplus, iflux); @@ -298,7 +298,7 @@ namespace Step33 template static void compute_forcing_vector (const InputVector &W, - std_cxx11::array + std::array &forcing) { @@ -1763,16 +1763,16 @@ namespace Step33 // later easily be computed from it: std::vector < - std_cxx11::array , dim>, EulerEquations::n_components > + std::array , dim>, EulerEquations::n_components > > flux(n_q_points); std::vector < - std_cxx11::array , EulerEquations::n_components > + std::array , EulerEquations::n_components > > flux_old(n_q_points); - std::vector < std_cxx11::array< Sacado::Fad::DFad, EulerEquations::n_components> > forcing(n_q_points); + std::vector < std::array< Sacado::Fad::DFad, EulerEquations::n_components> > forcing(n_q_points); - std::vector < std_cxx11::array< double, EulerEquations::n_components> > forcing_old(n_q_points); + std::vector < std::array< double, EulerEquations::n_components> > forcing_old(n_q_points); for (unsigned int q=0; q, EulerEquations::n_components> > normal_fluxes(n_q_points); - std::vector< std_cxx11::array < double, EulerEquations::n_components> > normal_fluxes_old(n_q_points); + std::vector< std::array < Sacado::Fad::DFad, EulerEquations::n_components> > normal_fluxes(n_q_points); + std::vector< std::array < double, EulerEquations::n_components> > normal_fluxes_old(n_q_points); double alpha; diff --git a/examples/step-34/step-34.cc b/examples/step-34/step-34.cc index 0e7253f1a7..fc1981cd56 100644 --- a/examples/step-34/step-34.cc +++ b/examples/step-34/step-34.cc @@ -287,7 +287,7 @@ namespace Step34 Functions::ParsedFunction exact_solution; unsigned int singular_quadrature_order; - std_cxx11::shared_ptr > quadrature; + std::shared_ptr > quadrature; SolverControl solver_control; @@ -431,7 +431,7 @@ namespace Step34 prm.enter_subsection("Quadrature rules"); { quadrature = - std_cxx11::shared_ptr > + std::shared_ptr > (new QuadratureSelector (prm.get("Quadrature type"), prm.get_integer("Quadrature order"))); singular_quadrature_order = prm.get_integer("Singular quadrature order"); diff --git a/examples/step-35/step-35.cc b/examples/step-35/step-35.cc index 4ccaaea4bc..e4885ca824 100644 --- a/examples/step-35/step-35.cc +++ b/examples/step-35/step-35.cc @@ -521,7 +521,7 @@ namespace Step35 // the iterators stored internally is moved up one step as well, thereby // always staying in sync. As it so happens, there is a deal.II class that // facilitates this sort of thing. - typedef std_cxx11::tuple< typename DoFHandler::active_cell_iterator, + typedef std::tuple< typename DoFHandler::active_cell_iterator, typename DoFHandler::active_cell_iterator > IteratorTuple; @@ -898,11 +898,11 @@ namespace Step35 InitGradScratchData &scratch, InitGradPerTaskData &data) { - scratch.fe_val_vel.reinit (std_cxx11::get<0> (*SI)); - scratch.fe_val_pres.reinit (std_cxx11::get<1> (*SI)); + scratch.fe_val_vel.reinit (std::get<0> (*SI)); + scratch.fe_val_pres.reinit (std::get<1> (*SI)); - std_cxx11::get<0> (*SI)->get_dof_indices (data.vel_local_dof_indices); - std_cxx11::get<1> (*SI)->get_dof_indices (data.pres_local_dof_indices); + std::get<0> (*SI)->get_dof_indices (data.vel_local_dof_indices); + std::get<1> (*SI)->get_dof_indices (data.pres_local_dof_indices); data.local_grad = 0.; for (unsigned int q=0; q::AdditionalData::none; additional_data.mapping_update_flags = (update_gradients | update_JxW_values | update_quadrature_points); - std_cxx11::shared_ptr > + std::shared_ptr > system_mf_storage(new MatrixFree()); system_mf_storage->reinit (dof_handler, constraints, QGauss<1>(fe.degree+1), additional_data); @@ -891,7 +891,7 @@ namespace Step37 additional_data.mapping_update_flags = (update_gradients | update_JxW_values | update_quadrature_points); additional_data.level_mg_handler = level; - std_cxx11::shared_ptr > + std::shared_ptr > mg_mf_storage_level(new MatrixFree()); mg_mf_storage_level->reinit(dof_handler, level_constraints, QGauss<1>(fe.degree+1), additional_data); diff --git a/examples/step-42/step-42.cc b/examples/step-42/step-42.cc index 0c5c8650ef..405cac8a65 100644 --- a/examples/step-42/step-42.cc +++ b/examples/step-42/step-42.cc @@ -751,7 +751,7 @@ namespace Step42 // one shot at setting it; the same is true for the mesh refinement // criterion): const std::string base_mesh; - const std_cxx11::shared_ptr > obstacle; + const std::shared_ptr > obstacle; struct RefinementStrategy { diff --git a/examples/step-43/step-43.cc b/examples/step-43/step-43.cc index d4b14d64e1..c47bdcdc82 100644 --- a/examples/step-43/step-43.cc +++ b/examples/step-43/step-43.cc @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -69,6 +68,7 @@ #include #include #include +#include // At the end of this top-matter, we open a namespace for the current project @@ -591,8 +591,8 @@ namespace Step43 const double porosity; const double AOS_threshold; - std_cxx11::shared_ptr Amg_preconditioner; - std_cxx11::shared_ptr Mp_preconditioner; + std::shared_ptr Amg_preconditioner; + std::shared_ptr Mp_preconditioner; bool rebuild_saturation_matrix; @@ -981,11 +981,11 @@ namespace Step43 { assemble_darcy_preconditioner (); - Amg_preconditioner = std_cxx11::shared_ptr + Amg_preconditioner = std::shared_ptr (new TrilinosWrappers::PreconditionIC()); Amg_preconditioner->initialize(darcy_preconditioner_matrix.block(0,0)); - Mp_preconditioner = std_cxx11::shared_ptr + Mp_preconditioner = std::shared_ptr (new TrilinosWrappers::PreconditionIC()); Mp_preconditioner->initialize(darcy_preconditioner_matrix.block(1,1)); diff --git a/examples/step-44/step-44.cc b/examples/step-44/step-44.cc index 964a07c4a6..2cecb638c3 100644 --- a/examples/step-44/step-44.cc +++ b/examples/step-44/step-44.cc @@ -800,7 +800,7 @@ namespace Step44 // materials are used in different regions of the domain, as well as the // inverse of the deformation gradient... private: - std_cxx11::shared_ptr< Material_Compressible_Neo_Hook_Three_Field > material; + std::shared_ptr< Material_Compressible_Neo_Hook_Three_Field > material; Tensor<2, dim> F_inv; @@ -2111,14 +2111,14 @@ namespace Step44 // non-constant. WorkStream::run(dof_handler_ref.begin_active(), dof_handler_ref.end(), - std_cxx11::bind(&Solid::assemble_system_tangent_one_cell, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind(&Solid::copy_local_to_global_K, - this, - std_cxx11::_1), + std::bind(&Solid::assemble_system_tangent_one_cell, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind(&Solid::copy_local_to_global_K, + this, + std::placeholders::_1), scratch_data, per_task_data); @@ -2293,14 +2293,14 @@ namespace Step44 WorkStream::run(dof_handler_ref.begin_active(), dof_handler_ref.end(), - std_cxx11::bind(&Solid::assemble_system_rhs_one_cell, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind(&Solid::copy_local_to_global_rhs, - this, - std_cxx11::_1), + std::bind(&Solid::assemble_system_rhs_one_cell, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind(&Solid::copy_local_to_global_rhs, + this, + std::placeholders::_1), scratch_data, per_task_data); diff --git a/examples/step-51/step-51.cc b/examples/step-51/step-51.cc index e14dbaaf03..2b987bf4da 100644 --- a/examples/step-51/step-51.cc +++ b/examples/step-51/step-51.cc @@ -1034,10 +1034,10 @@ namespace Step51 WorkStream::run(dof_handler_u_post.begin_active(), dof_handler_u_post.end(), - std_cxx11::bind (&HDG::postprocess_one_cell, - std_cxx11::ref(*this), - std_cxx11::_1, std_cxx11::_2, std_cxx11::_3), - std_cxx11::function(), + std::bind (&HDG::postprocess_one_cell, + std::ref(*this), + std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), + std::function(), scratch, 0U); } diff --git a/examples/step-52/step-52.cc b/examples/step-52/step-52.cc index d913d52567..c964f400b9 100644 --- a/examples/step-52/step-52.cc +++ b/examples/step-52/step-52.cc @@ -481,10 +481,10 @@ namespace Step52 for (unsigned int i=0; i topography_data; - static std_cxx11::array,2> get_endpoints (); - static std_cxx11::array n_intervals (); + static std::array,2> get_endpoints (); + static std::array n_intervals (); static std::vector get_data (); }; @@ -128,20 +128,20 @@ namespace Step53 } - std_cxx11::array,2> + std::array,2> AfricaTopography::get_endpoints () { - std_cxx11::array,2> endpoints; + std::array,2> endpoints; endpoints[0] = std::make_pair (-6.983333, 11.966667); endpoints[1] = std::make_pair (25, 35.95); return endpoints; } - std_cxx11::array + std::array AfricaTopography::n_intervals () { - std_cxx11::array endpoints; + std::array endpoints; endpoints[0] = 379; endpoints[1] = 219; return endpoints; @@ -382,9 +382,9 @@ namespace Step53 corner_points[0], corner_points[1], true); - GridTools::transform (std_cxx11::bind(&AfricaGeometry::push_forward, - std_cxx11::cref(geometry), - std_cxx11::_1), + GridTools::transform (std::bind(&AfricaGeometry::push_forward, + std::cref(geometry), + std::placeholders::_1), triangulation); } diff --git a/examples/step-9/step-9.cc b/examples/step-9/step-9.cc index 3151b8dcf1..c1bd66b9b8 100644 --- a/examples/step-9/step-9.cc +++ b/examples/step-9/step-9.cc @@ -515,7 +515,7 @@ namespace Step9 template static - void estimate_cell (const SynchronousIterators::active_cell_iterator, + void estimate_cell (const SynchronousIterators::active_cell_iterator, Vector::iterator> > &cell, EstimateScratchData &scratch_data, const EstimateCopyData ©_data); @@ -1024,7 +1024,7 @@ namespace Step9 ExcInvalidVectorLength (error_per_cell.size(), dof_handler.get_triangulation().n_active_cells())); - typedef std_cxx11::tuple::active_cell_iterator,Vector::iterator> + typedef std::tuple::active_cell_iterator,Vector::iterator> IteratorTuple; SynchronousIterators @@ -1036,7 +1036,7 @@ namespace Step9 WorkStream::run (begin_sync_it, end_sync_it, &GradientEstimation::template estimate_cell, - std_cxx11::function (), + std::function (), EstimateScratchData (dof_handler.get_fe(), solution), EstimateCopyData ()); @@ -1075,12 +1075,12 @@ namespace Step9 // passing the following as the third argument when calling WorkStream::run // above: // @code - // std_cxx11::function &, - // EstimateScratchData &, - // EstimateCopyData &)> - // (std_cxx11::bind (&GradientEstimation::template estimate_cell, - // std_cxx11::_1, - // std_cxx11::_2)) + // std::function &, + // EstimateScratchData &, + // EstimateCopyData &)> + // (std::bind (&GradientEstimation::template estimate_cell, + // std::placeholders::_1, + // std::placeholders::_2)) // @endcode // This creates a function object taking three arguments, but when it calls // the underlying function object, it simply only uses the first and second @@ -1091,7 +1091,7 @@ namespace Step9 // Now for the details: template void - GradientEstimation::estimate_cell (const SynchronousIterators::active_cell_iterator, + GradientEstimation::estimate_cell (const SynchronousIterators::active_cell_iterator, Vector::iterator> > &cell, EstimateScratchData &scratch_data, const EstimateCopyData &) @@ -1109,7 +1109,7 @@ namespace Step9 active_neighbors.reserve (GeometryInfo::faces_per_cell * GeometryInfo::max_children_per_face); - typename DoFHandler::active_cell_iterator cell_it(std_cxx11::get<0>(*cell)); + typename DoFHandler::active_cell_iterator cell_it(std::get<0>(*cell)); // First initialize the FEValues object, as well as the // Y tensor: @@ -1144,14 +1144,14 @@ namespace Step9 // neighbors, of course. active_neighbors.clear (); for (unsigned int face_no=0; face_no::faces_per_cell; ++face_no) - if (! std_cxx11::get<0>(*cell)->at_boundary(face_no)) + if (! std::get<0>(*cell)->at_boundary(face_no)) { // First define an abbreviation for the iterator to the face and // the neighbor const typename DoFHandler::face_iterator - face = std_cxx11::get<0>(*cell)->face(face_no); + face = std::get<0>(*cell)->face(face_no); const typename DoFHandler::cell_iterator - neighbor = std_cxx11::get<0>(*cell)->neighbor(face_no); + neighbor = std::get<0>(*cell)->neighbor(face_no); // Then check whether the neighbor is active. If it is, then it // is on the same level or one level coarser (if we are not in @@ -1194,7 +1194,7 @@ namespace Step9 // as an internal error. We therefore use a predefined // exception class to throw here. Assert (neighbor_child->neighbor(face_no==0 ? 1 : 0) - ==std_cxx11::get<0>(*cell),ExcInternalError()); + ==std::get<0>(*cell),ExcInternalError()); // If the check succeeded, we push the active neighbor // we just found to the stack we keep: @@ -1205,7 +1205,7 @@ namespace Step9 // `behind' the subfaces of the current face for (unsigned int subface_no=0; subface_non_children(); ++subface_no) active_neighbors.push_back ( - std_cxx11::get<0>(*cell)->neighbor_child_on_subface(face_no,subface_no)); + std::get<0>(*cell)->neighbor_child_on_subface(face_no,subface_no)); } } @@ -1307,9 +1307,9 @@ namespace Step9 // at the second element of the pair of iterators, which requires // slightly awkward syntax but is not otherwise particularly // difficult: - *(std_cxx11::get<1>(*cell)) = (std::pow(std_cxx11::get<0>(*cell)->diameter(), - 1+1.0*dim/2) * - std::sqrt(gradient.norm_square())); + *(std::get<1>(*cell)) = (std::pow(std::get<0>(*cell)->diameter(), + 1+1.0*dim/2) * + std::sqrt(gradient.norm_square())); } } diff --git a/include/deal.II/base/aligned_vector.h b/include/deal.II/base/aligned_vector.h index b8c52c0699..9d85220127 100644 --- a/include/deal.II/base/aligned_vector.h +++ b/include/deal.II/base/aligned_vector.h @@ -18,7 +18,6 @@ #define dealii__aligned_vector_h #include -#include #include #include #include @@ -27,6 +26,7 @@ #include #include +#include @@ -355,7 +355,7 @@ namespace internal // (void*) to silence compiler warning for virtual classes (they will // never arrive here because they are non-trivial). - if (std_cxx11::is_trivial::value == true) + if (std::is_trivial::value == true) std::memcpy ((void *)(destination_+begin), (void *)(source_+begin), (end-begin)*sizeof(T)); else if (copy_source_ == false) @@ -411,7 +411,7 @@ namespace internal // do not use memcmp for long double because on some systems it does not // completely fill its memory and may lead to false positives in // e.g. valgrind - if (std_cxx11::is_trivial::value == true && + if (std::is_trivial::value == true && types_are_equal::value == false) { const unsigned char zero [sizeof(T)] = {}; @@ -437,7 +437,7 @@ namespace internal // element to (void*) to silence compiler warning for virtual // classes (they will never arrive here because they are // non-trivial). - if (std_cxx11::is_trivial::value == true && trivial_element) + if (std::is_trivial::value == true && trivial_element) std::memset ((void *)(destination_+begin), 0, (end-begin)*sizeof(T)); else copy_construct_or_assign(begin, end, @@ -583,7 +583,7 @@ void AlignedVector::resize_fast (const size_type size_in) { const size_type old_size = size(); - if (std_cxx11::is_trivial::value == false && size_in < old_size) + if (std::is_trivial::value == false && size_in < old_size) { // call destructor on fields that are released. doing it backward // releases the elements in reverse order as compared to how they were @@ -596,7 +596,7 @@ AlignedVector::resize_fast (const size_type size_in) // need to still set the values in case the class is non-trivial because // virtual classes etc. need to run their (default) constructor - if (std_cxx11::is_trivial::value == false && size_in > old_size) + if (std::is_trivial::value == false && size_in > old_size) dealii::internal::AlignedVectorSet (size_in-old_size, T(), _data+old_size); } @@ -609,7 +609,7 @@ AlignedVector::resize (const size_type size_in, const T &init) { const size_type old_size = size(); - if (std_cxx11::is_trivial::value == false && size_in < old_size) + if (std::is_trivial::value == false && size_in < old_size) { // call destructor on fields that are released. doing it backward // releases the elements in reverse order as compared to how they were @@ -677,7 +677,7 @@ AlignedVector::clear () { if (_data != 0) { - if (std_cxx11::is_trivial::value == false) + if (std::is_trivial::value == false) while (_end_data != _data) (--_end_data)->~T(); @@ -698,7 +698,7 @@ AlignedVector::push_back (const T in_data) Assert (_end_data <= _end_allocated, ExcInternalError()); if (_end_data == _end_allocated) reserve (std::max(2*capacity(),static_cast(16))); - if (std_cxx11::is_trivial::value == false) + if (std::is_trivial::value == false) new (_end_data++) T(in_data); else *_end_data++ = in_data; @@ -741,7 +741,7 @@ AlignedVector::insert_back (ForwardIterator begin, reserve (old_size + (end-begin)); for ( ; begin != end; ++begin, ++_end_data) { - if (std_cxx11::is_trivial::value == false) + if (std::is_trivial::value == false) new (_end_data) T; *_end_data = *begin; } diff --git a/include/deal.II/base/data_out_base.h b/include/deal.II/base/data_out_base.h index 04b6eb5463..b86e49ede7 100644 --- a/include/deal.II/base/data_out_base.h +++ b/include/deal.II/base/data_out_base.h @@ -21,12 +21,12 @@ #include #include #include -#include #include #include #include #include +#include #include @@ -1382,7 +1382,7 @@ namespace DataOutBase template void write_dx (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const DXFlags &flags, std::ostream &out); @@ -1433,7 +1433,7 @@ namespace DataOutBase template void write_eps (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const EpsFlags &flags, std::ostream &out); @@ -1445,7 +1445,7 @@ namespace DataOutBase template void write_eps (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const EpsFlags &flags, std::ostream &out); @@ -1462,7 +1462,7 @@ namespace DataOutBase template void write_gmv (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const GmvFlags &flags, std::ostream &out); @@ -1525,7 +1525,7 @@ namespace DataOutBase template void write_gnuplot (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const GnuplotFlags &flags, std::ostream &out); @@ -1577,7 +1577,7 @@ namespace DataOutBase template void write_povray (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const PovrayFlags &flags, std::ostream &out); @@ -1590,7 +1590,7 @@ namespace DataOutBase template void write_tecplot (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const TecplotFlags &flags, std::ostream &out); @@ -1617,7 +1617,7 @@ namespace DataOutBase void write_tecplot_binary ( const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const TecplotFlags &flags, std::ostream &out); @@ -1638,7 +1638,7 @@ namespace DataOutBase template void write_ucd (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const UcdFlags &flags, std::ostream &out); @@ -1664,7 +1664,7 @@ namespace DataOutBase template void write_vtk (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const VtkFlags &flags, std::ostream &out); @@ -1695,7 +1695,7 @@ namespace DataOutBase template void write_vtu (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const VtkFlags &flags, std::ostream &out); @@ -1722,7 +1722,7 @@ namespace DataOutBase template void write_vtu_main (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const VtkFlags &flags, std::ostream &out); @@ -1771,7 +1771,7 @@ namespace DataOutBase write_pvtu_record (std::ostream &out, const std::vector &piece_names, const std::vector &data_names, - const std::vector > &vector_data_ranges); + const std::vector > &vector_data_ranges); /** * In ParaView it is possible to visualize time-dependent data tagged with @@ -1927,7 +1927,7 @@ namespace DataOutBase template void write_svg (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const SvgFlags &flags, std::ostream &out); @@ -1972,7 +1972,7 @@ namespace DataOutBase void write_deal_II_intermediate ( const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const Deal_II_IntermediateFlags &flags, std::ostream &out); @@ -2010,7 +2010,7 @@ namespace DataOutBase template void write_filtered_data (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, DataOutFilter &filtered_data); /** @@ -2597,7 +2597,7 @@ protected: * fields. */ virtual - std::vector > + std::vector > get_vector_data_ranges () const; /** @@ -2833,7 +2833,7 @@ protected: * fields. */ virtual - std::vector > + std::vector > get_vector_data_ranges () const; private: @@ -2848,7 +2848,7 @@ private: * Information about whether certain components of the output field are to * be considered vectors. */ - std::vector > + std::vector > vector_data_ranges; }; diff --git a/include/deal.II/base/function.h b/include/deal.II/base/function.h index 1f1e93a4b9..d49fdedb24 100644 --- a/include/deal.II/base/function.h +++ b/include/deal.II/base/function.h @@ -24,8 +24,8 @@ #include #include #include -#include +#include #include DEAL_II_NAMESPACE_OPEN @@ -638,9 +638,9 @@ protected: * or we could write it like so: * @code * ScalarFunctionFromFunctionObject - * my_distance_object (std_cxx11::bind (&Point::distance, + * my_distance_object (std::bind (&Point::distance, * q, - * std_cxx11::_1)); + * std::placeholders::_1)); * @endcode * The savings in work to write this are apparent. * @@ -655,7 +655,7 @@ public: * convert this into an object that matches the Function * interface. */ - ScalarFunctionFromFunctionObject (const std_cxx11::function &)> &function_object); + ScalarFunctionFromFunctionObject (const std::function &)> &function_object); /** * Return the value of the function at the given point. Returns the value @@ -669,7 +669,7 @@ private: * The function object which we call when this class's value() or * value_list() functions are called. */ - const std_cxx11::function &)> function_object; + const std::function &)> function_object; }; @@ -722,7 +722,7 @@ public: * @param selected_component The single component that should be filled by * the first argument. */ - VectorFunctionFromScalarFunctionObject (const std_cxx11::function &)> &function_object, + VectorFunctionFromScalarFunctionObject (const std::function &)> &function_object, const unsigned int selected_component, const unsigned int n_components); @@ -746,7 +746,7 @@ private: * The function object which we call when this class's value() or * value_list() functions are called. */ - const std_cxx11::function &)> function_object; + const std::function &)> function_object; /** * The vector component whose value is to be filled by the given scalar diff --git a/include/deal.II/base/function.templates.h b/include/deal.II/base/function.templates.h index 65355b0be0..53f213041c 100644 --- a/include/deal.II/base/function.templates.h +++ b/include/deal.II/base/function.templates.h @@ -639,7 +639,7 @@ ComponentSelectFunction::memory_consumption () const template ScalarFunctionFromFunctionObject:: -ScalarFunctionFromFunctionObject (const std_cxx11::function &)> &function_object) +ScalarFunctionFromFunctionObject (const std::function &)> &function_object) : Function(1), function_object (function_object) @@ -663,7 +663,7 @@ ScalarFunctionFromFunctionObject::value (const Point &p, template VectorFunctionFromScalarFunctionObject:: VectorFunctionFromScalarFunctionObject ( - const std_cxx11::function &)> &function_object, + const std::function &)> &function_object, const unsigned int selected_component, const unsigned int n_components) : diff --git a/include/deal.II/base/function_lib.h b/include/deal.II/base/function_lib.h index fea73c9471..87c87f8ae4 100644 --- a/include/deal.II/base/function_lib.h +++ b/include/deal.II/base/function_lib.h @@ -22,7 +22,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -1136,8 +1136,8 @@ namespace Functions * class has a number of conversion constructors that allow converting * other data types into a table where you specify this argument. */ - InterpolatedTensorProductGridData (const std_cxx11::array,dim> &coordinate_values, - const Table &data_values); + InterpolatedTensorProductGridData (const std::array,dim> &coordinate_values, + const Table &data_values); /** * Compute the value of the function set by bilinear interpolation of the @@ -1179,7 +1179,7 @@ namespace Functions /** * The set of coordinate values in each of the coordinate directions. */ - const std_cxx11::array,dim> coordinate_values; + const std::array,dim> coordinate_values; /** * The data that is to be interpolated. @@ -1241,8 +1241,8 @@ namespace Functions * class has a number of conversion constructors that allow converting * other data types into a table where you specify this argument. */ - InterpolatedUniformGridData (const std_cxx11::array,dim> &interval_endpoints, - const std_cxx11::array &n_subintervals, + InterpolatedUniformGridData (const std::array,dim> &interval_endpoints, + const std::array &n_subintervals, const Table &data_values); /** @@ -1264,12 +1264,12 @@ namespace Functions /** * The set of interval endpoints in each of the coordinate directions. */ - const std_cxx11::array,dim> interval_endpoints; + const std::array,dim> interval_endpoints; /** * The number of subintervals in each of the coordinate directions. */ - const std_cxx11::array n_subintervals; + const std::array n_subintervals; /** * The data that is to be interpolated. diff --git a/include/deal.II/base/function_spherical.h b/include/deal.II/base/function_spherical.h index a2de2db170..b0455ca74b 100644 --- a/include/deal.II/base/function_spherical.h +++ b/include/deal.II/base/function_spherical.h @@ -20,7 +20,9 @@ #include #include -#include + + +#include DEAL_II_NAMESPACE_OPEN @@ -92,7 +94,7 @@ namespace Functions * Return the value at point @p sp. Here, @p sp is provided in spherical * coordinates. */ - virtual double svalue(const std_cxx11::array &sp, + virtual double svalue(const std::array &sp, const unsigned int component) const; /** @@ -101,8 +103,8 @@ namespace Functions * The returned object should contain derivatives in the following order: * $\{ f_{,r},\, f_{,\theta},\, f_{,\phi}\}$. */ - virtual std_cxx11::array sgradient(const std_cxx11::array &sp, - const unsigned int component) const; + virtual std::array sgradient(const std::array &sp, + const unsigned int component) const; /** * Return the Hessian in spherical coordinates. @@ -110,8 +112,8 @@ namespace Functions * The returned object should contain derivatives in the following order: * $\{ f_{,rr},\, f_{,\theta\theta},\, f_{,\phi\phi},\, f_{,r\theta},\, f_{,r\phi},\, f_{,\theta\phi}\}$. */ - virtual std_cxx11::array shessian (const std_cxx11::array &sp, - const unsigned int component) const; + virtual std::array shessian (const std::array &sp, + const unsigned int component) const; /** * A vector from the origin to the center of spherical coordinate system. diff --git a/include/deal.II/base/geometric_utilities.h b/include/deal.II/base/geometric_utilities.h index 2478a80499..18f3e3eb7b 100644 --- a/include/deal.II/base/geometric_utilities.h +++ b/include/deal.II/base/geometric_utilities.h @@ -18,7 +18,9 @@ #include #include -#include + + +#include DEAL_II_NAMESPACE_OPEN @@ -54,7 +56,7 @@ namespace GeometricUtilities * @f} */ template - std_cxx11::array + std::array to_spherical(const Point &point); /** @@ -72,7 +74,7 @@ namespace GeometricUtilities */ template Point - from_spherical(const std_cxx11::array &scoord); + from_spherical(const std::array &scoord); } } diff --git a/include/deal.II/base/graph_coloring.h b/include/deal.II/base/graph_coloring.h index bdfde8e596..75001594ef 100644 --- a/include/deal.II/base/graph_coloring.h +++ b/include/deal.II/base/graph_coloring.h @@ -20,10 +20,10 @@ #include #include -#include #include #include +#include #include #include @@ -108,7 +108,7 @@ namespace GraphColoring std::vector > create_partitioning(const Iterator &begin, const typename identity::type &end, - const std_cxx11::function (const Iterator &)> &get_conflict_indices) + const std::function (const Iterator &)> &get_conflict_indices) { // Number of iterators. unsigned int n_iterators = 0; @@ -210,7 +210,7 @@ namespace GraphColoring template void make_dsatur_coloring(std::vector &partition, - const std_cxx11::function (const Iterator &)> &get_conflict_indices, + const std::function (const Iterator &)> &get_conflict_indices, std::vector > &partition_coloring) { partition_coloring.clear (); @@ -514,7 +514,7 @@ namespace GraphColoring std::vector > make_graph_coloring(const Iterator &begin, const typename identity::type &end, - const std_cxx11::function (const typename identity::type &)> &get_conflict_indices) + const std::function (const typename identity::type &)> &get_conflict_indices) { Assert (begin != end, ExcMessage ("GraphColoring is not prepared to deal with empty ranges!")); diff --git a/include/deal.II/base/logstream.h b/include/deal.II/base/logstream.h index c9d1acd240..6e11df3a49 100644 --- a/include/deal.II/base/logstream.h +++ b/include/deal.II/base/logstream.h @@ -19,7 +19,6 @@ #include #include #include -#include #include #include @@ -27,6 +26,7 @@ #include #include #include +#include #ifdef DEAL_II_HAVE_SYS_TIMES_H # include @@ -536,7 +536,7 @@ private: * We use tbb's thread local storage facility to generate a stringstream for * every thread that sends log messages. */ - Threads::ThreadLocalStorage > outstreams; + Threads::ThreadLocalStorage > outstreams; template friend LogStream &operator << (LogStream &log, const T &t); }; diff --git a/include/deal.II/base/memory_consumption.h b/include/deal.II/base/memory_consumption.h index d5da40ef98..3b85d74db8 100644 --- a/include/deal.II/base/memory_consumption.h +++ b/include/deal.II/base/memory_consumption.h @@ -18,16 +18,15 @@ #include -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include DEAL_II_NAMESPACE_OPEN @@ -98,7 +97,7 @@ namespace MemoryConsumption */ template inline - typename std_cxx11::enable_if::value, std::size_t>::type + typename std::enable_if::value, std::size_t>::type memory_consumption (const T &t); /** @@ -109,7 +108,7 @@ namespace MemoryConsumption */ template inline - typename std_cxx11::enable_if::value || std_cxx11::is_pointer::value), std::size_t>::type + typename std::enable_if::value || std::is_pointer::value), std::size_t>::type memory_consumption (const T &t); /** @@ -177,7 +176,7 @@ namespace MemoryConsumption /** * Determine the amount of memory in bytes consumed by a - * std_cxx11::array of N elements of type T by + * std::array of N elements of type T by * calling memory_consumption() for each entry. * * This function loops over all entries of the array and determines their @@ -197,7 +196,7 @@ namespace MemoryConsumption */ template inline - std::size_t memory_consumption (const std_cxx11::array &v); + std::size_t memory_consumption (const std::array &v); /** * Estimate the amount of memory (in bytes) occupied by a C-style array. @@ -250,16 +249,16 @@ namespace MemoryConsumption */ template inline - std::size_t memory_consumption (const std_cxx11::shared_ptr &); + std::size_t memory_consumption (const std::shared_ptr &); /** - * Return the amount of memory used by a std_cxx11::unique_ptr object. + * Return the amount of memory used by a std::unique_ptr object. * * @note This returns the size of the pointer, not of the object pointed to. */ template inline - std::size_t memory_consumption (const std_cxx11::unique_ptr &); + std::size_t memory_consumption (const std::unique_ptr &); } @@ -270,7 +269,7 @@ namespace MemoryConsumption { template inline - typename std_cxx11::enable_if::value, std::size_t>::type + typename std::enable_if::value, std::size_t>::type memory_consumption(const T &) { return sizeof(T); @@ -323,7 +322,7 @@ namespace MemoryConsumption std::size_t memory_consumption (const std::vector &v) { // shortcut for types that do not allocate memory themselves - if (std_cxx11::is_fundamental::value || std_cxx11::is_pointer::value) + if (std::is_fundamental::value || std::is_pointer::value) { return v.capacity()*sizeof(T) + sizeof(v); } @@ -342,10 +341,10 @@ namespace MemoryConsumption template - std::size_t memory_consumption (const std_cxx11::array &v) + std::size_t memory_consumption (const std::array &v) { // shortcut for types that do not allocate memory themselves - if (std_cxx11::is_fundamental::value || std_cxx11::is_pointer::value) + if (std::is_fundamental::value || std::is_pointer::value) { return sizeof(v); } @@ -402,9 +401,9 @@ namespace MemoryConsumption template inline std::size_t - memory_consumption (const std_cxx11::shared_ptr &) + memory_consumption (const std::shared_ptr &) { - return sizeof(std_cxx11::shared_ptr); + return sizeof(std::shared_ptr); } @@ -412,16 +411,16 @@ namespace MemoryConsumption template inline std::size_t - memory_consumption (const std_cxx11::unique_ptr &) + memory_consumption (const std::unique_ptr &) { - return sizeof(std_cxx11::unique_ptr); + return sizeof(std::unique_ptr); } template inline - typename std_cxx11::enable_if::value || std_cxx11::is_pointer::value), std::size_t>::type + typename std::enable_if::value || std::is_pointer::value), std::size_t>::type memory_consumption (const T &t) { return t.memory_consumption(); diff --git a/include/deal.II/base/mg_level_object.h b/include/deal.II/base/mg_level_object.h index 7fcbb840c9..1f8d689af7 100644 --- a/include/deal.II/base/mg_level_object.h +++ b/include/deal.II/base/mg_level_object.h @@ -18,8 +18,7 @@ #include #include - -#include +#include DEAL_II_NAMESPACE_OPEN @@ -151,7 +150,7 @@ private: /** * Array of the objects to be held. */ - std::vector > objects; + std::vector > objects; }; @@ -202,7 +201,7 @@ MGLevelObject::resize (const unsigned int new_minlevel, minlevel = new_minlevel; for (unsigned int i=0; i (new Object)); + objects.push_back(std::shared_ptr (new Object)); } @@ -210,7 +209,7 @@ template MGLevelObject & MGLevelObject::operator = (const double d) { - typename std::vector >::iterator v; + typename std::vector >::iterator v; for (v = objects.begin(); v != objects.end(); ++v) **v=d; return *this; @@ -230,7 +229,7 @@ template void MGLevelObject::clear_elements () { - typename std::vector >::iterator v; + typename std::vector >::iterator v; for (v = objects.begin(); v != objects.end(); ++v) (*v)->clear(); } @@ -257,7 +256,7 @@ std::size_t MGLevelObject::memory_consumption () const { std::size_t result = sizeof(*this); - typedef typename std::vector >::const_iterator Iter; + typedef typename std::vector >::const_iterator Iter; const Iter end = objects.end(); for (Iter o=objects.begin(); o!=end; ++o) result += (*o)->memory_consumption(); diff --git a/include/deal.II/base/parallel.h b/include/deal.II/base/parallel.h index 24c1315364..e39d2d2ec8 100644 --- a/include/deal.II/base/parallel.h +++ b/include/deal.II/base/parallel.h @@ -23,12 +23,10 @@ #include #include -#include -#include -#include -#include - #include +#include +#include +#include #ifdef DEAL_II_WITH_THREADS # include @@ -107,9 +105,9 @@ namespace parallel static void apply (const F &f, - const std_cxx11::tuple &p) + const std::tuple &p) { - *std_cxx11::get<1>(p) = f (*std_cxx11::get<0>(p)); + *std::get<1>(p) = f (*std::get<0>(p)); } /** @@ -119,10 +117,10 @@ namespace parallel static void apply (const F &f, - const std_cxx11::tuple &p) + const std::tuple &p) { - *std_cxx11::get<2>(p) = f (*std_cxx11::get<0>(p), - *std_cxx11::get<1>(p)); + *std::get<2>(p) = f (*std::get<0>(p), + *std::get<1>(p)); } /** @@ -133,11 +131,11 @@ namespace parallel static void apply (const F &f, - const std_cxx11::tuple &p) + const std::tuple &p) { - *std_cxx11::get<3>(p) = f (*std_cxx11::get<0>(p), - *std_cxx11::get<1>(p), - *std_cxx11::get<2>(p)); + *std::get<3>(p) = f (*std::get<0>(p), + *std::get<1>(p), + *std::get<2>(p)); } }; @@ -195,7 +193,7 @@ namespace parallel for (OutputIterator in = begin_in; in != end_in;) *out++ = predicate (*in++); #else - typedef std_cxx11::tuple Iterators; + typedef std::tuple Iterators; typedef SynchronousIterators SyncIterators; Iterators x_begin (begin_in, out); Iterators x_end (end_in, OutputIterator()); @@ -252,7 +250,7 @@ namespace parallel *out++ = predicate (*in1++, *in2++); #else typedef - std_cxx11::tuple + std::tuple Iterators; typedef SynchronousIterators SyncIterators; Iterators x_begin (begin_in1, in2, out); @@ -312,7 +310,7 @@ namespace parallel *out++ = predicate (*in1++, *in2++, *in3++); #else typedef - std_cxx11::tuple + std::tuple Iterators; typedef SynchronousIterators SyncIterators; Iterators x_begin (begin_in1, in2, in3, out); @@ -371,11 +369,11 @@ namespace parallel * { * parallel::apply_to_subranges * (0, A.n_rows(), - * std_cxx11::bind (&mat_vec_on_subranges, - * std_cxx11::_1, std_cxx11::_2, - * std_cxx11::cref(A), - * std_cxx11::cref(x), - * std_cxx11::ref(y)), + * std::bind (&mat_vec_on_subranges, + * std::placeholders::_1, std::placeholders::_2, + * std::cref(A), + * std::cref(x), + * std::ref(y)), * 50); * } * @@ -391,10 +389,10 @@ namespace parallel * } * @endcode * - * Note how we use the std_cxx11::bind function to convert + * Note how we use the std::bind function to convert * mat_vec_on_subranges from a function that takes 5 arguments * to one taking 2 by binding the remaining arguments (the modifiers - * std_cxx11::ref and std_cxx11::cref make sure + * std::ref and std::cref make sure * that the enclosed variables are actually passed by reference and constant * reference, rather than by value). The resulting function object requires * only two arguments, begin_row and end_row, with all other arguments @@ -437,9 +435,9 @@ namespace parallel #else tbb::parallel_for (tbb::blocked_range (begin, end, grainsize), - std_cxx11::bind (&internal::apply_to_subranges, - std_cxx11::_1, - std_cxx11::cref(f)), + std::bind (&internal::apply_to_subranges, + std::placeholders::_1, + std::cref(f)), tbb::auto_partitioner()); #endif } @@ -591,7 +589,7 @@ namespace parallel * The function object to be used to reduce the result of two calls into * one number. */ - const std_cxx11::function reductor; + const std::function reductor; }; #endif } @@ -614,10 +612,10 @@ namespace parallel * std::sqrt * (parallel::accumulate_from_subranges * (0, A.n_rows(), - * std_cxx11::bind (&mat_norm_sqr_on_subranges, - * std_cxx11::_1, std_cxx11::_2, - * std_cxx11::cref(A), - * std_cxx11::cref(x)), + * std::bind (&mat_norm_sqr_on_subranges, + * std::placeholders::_1, std::placeholders::_2, + * std::cref(A), + * std::cref(x)), * 50); * } * @@ -731,12 +729,12 @@ namespace parallel * released it yet, a new object is created. To free the partitioner * again, return it by the release_one_partitioner() call. */ - std_cxx11::shared_ptr + std::shared_ptr acquire_one_partitioner() { dealii::Threads::Mutex::ScopedLock lock(mutex); if (in_use) - return std_cxx11::shared_ptr(new tbb::affinity_partitioner()); + return std::shared_ptr(new tbb::affinity_partitioner()); in_use = true; return my_partitioner; @@ -747,7 +745,7 @@ namespace parallel * acquire_one_partitioner(), this call makes the partitioner available * again. */ - void release_one_partitioner(std_cxx11::shared_ptr &p) + void release_one_partitioner(std::shared_ptr &p) { if (p.get() == my_partitioner.get()) { @@ -761,7 +759,7 @@ namespace parallel * The stored partitioner that can accumulate knowledge over several * runs of tbb::parallel_for */ - std_cxx11::shared_ptr my_partitioner; + std::shared_ptr my_partitioner; /** * A flag to indicate whether the partitioner has been acquired but not diff --git a/include/deal.II/base/parameter_handler.h b/include/deal.II/base/parameter_handler.h index 1178195a18..bf7dd90e44 100644 --- a/include/deal.II/base/parameter_handler.h +++ b/include/deal.II/base/parameter_handler.h @@ -20,8 +20,6 @@ #include #include #include -#include -#include #include #include @@ -29,6 +27,7 @@ #include #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -2158,13 +2157,13 @@ private: * than having to include all of the property_tree stuff from boost. This * works around a problem with gcc 4.5. */ - std_cxx11::unique_ptr entries; + std::unique_ptr entries; /** * A list of patterns that are used to describe the parameters of this * object. The are indexed by nodes in the property tree. */ - std::vector > patterns; + std::vector > patterns; /** * Mangle a string so that it doesn't contain any special characters or @@ -2282,7 +2281,7 @@ private: * * static void declare_parameters (ParameterHandler &prm); * private: - * std_cxx11::shared_ptr p; + * std::shared_ptr p; * }; * * @@ -2687,7 +2686,7 @@ ParameterHandler::load (Archive &ar, const unsigned int) patterns.clear (); for (unsigned int j=0; j(Patterns::pattern_factory(descriptions[j]))); + patterns.push_back (std::shared_ptr(Patterns::pattern_factory(descriptions[j]))); } diff --git a/include/deal.II/base/point.h b/include/deal.II/base/point.h index 8eed55b57e..0149994d48 100644 --- a/include/deal.II/base/point.h +++ b/include/deal.II/base/point.h @@ -63,7 +63,7 @@ DEAL_II_NAMESPACE_OPEN * a tensor (because it lacks the transformation properties under rotation of * the coordinate system) and should consequently not be represented by either * of these classes. Use an array of size 3 in this case, or the - * std_cxx11::array class. Alternatively, as in the case of + * std::array class. Alternatively, as in the case of * vector-valued functions, you can use objects of type Vector or * std::vector. * diff --git a/include/deal.II/base/polynomial.h b/include/deal.II/base/polynomial.h index 050b0cf3e7..a15b8a805a 100644 --- a/include/deal.II/base/polynomial.h +++ b/include/deal.II/base/polynomial.h @@ -22,8 +22,8 @@ #include #include #include -#include +#include #include DEAL_II_NAMESPACE_OPEN @@ -534,7 +534,7 @@ namespace Polynomials * shared_ptr in order to correctly free the memory of the vectors when * the global destructor is called. */ - static std::vector > > recursive_coefficients; + static std::vector > > recursive_coefficients; }; diff --git a/include/deal.II/base/polynomials_abf.h b/include/deal.II/base/polynomials_abf.h index f183c406ee..c36e9cc763 100644 --- a/include/deal.II/base/polynomials_abf.h +++ b/include/deal.II/base/polynomials_abf.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/base/quadrature_point_data.h b/include/deal.II/base/quadrature_point_data.h index 9ed971d6fd..8db1175937 100644 --- a/include/deal.II/base/quadrature_point_data.h +++ b/include/deal.II/base/quadrature_point_data.h @@ -763,11 +763,11 @@ namespace parallel data_size_in_bytes = sizeof(double) * dofs_per_cell * number_of_values; offset = triangulation->register_data_attach(data_size_in_bytes, - std_cxx11::bind(&ContinuousQuadratureDataTransfer::pack_function, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3)); + std::bind(&ContinuousQuadratureDataTransfer::pack_function, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3)); } @@ -776,11 +776,11 @@ namespace parallel void ContinuousQuadratureDataTransfer::interpolate () { triangulation->notify_ready_to_unpack(offset, - std_cxx11::bind(&ContinuousQuadratureDataTransfer::unpack_function, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3)); + std::bind(&ContinuousQuadratureDataTransfer::unpack_function, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3)); // invalidate the pointers data_storage = nullptr; diff --git a/include/deal.II/base/std_cxx11/array.h b/include/deal.II/base/std_cxx11/array.h index 4590660e1e..0e55d0a8ce 100644 --- a/include/deal.II/base/std_cxx11/array.h +++ b/include/deal.II/base/std_cxx11/array.h @@ -19,7 +19,6 @@ #include -#ifdef DEAL_II_WITH_CXX11 # include DEAL_II_NAMESPACE_OPEN @@ -29,18 +28,6 @@ namespace std_cxx11 } DEAL_II_NAMESPACE_CLOSE -#else - -#include -DEAL_II_NAMESPACE_OPEN -namespace std_cxx11 -{ - using boost::array; -} -DEAL_II_NAMESPACE_CLOSE - -#endif - // then allow using the old namespace name instead of the new one DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; diff --git a/include/deal.II/base/std_cxx11/bind.h b/include/deal.II/base/std_cxx11/bind.h index b6e54707db..f4ae73223f 100644 --- a/include/deal.II/base/std_cxx11/bind.h +++ b/include/deal.II/base/std_cxx11/bind.h @@ -19,7 +19,6 @@ #include -#ifdef DEAL_II_WITH_CXX11 # include @@ -43,46 +42,6 @@ namespace std_cxx11 } DEAL_II_NAMESPACE_CLOSE -#else - -#include - -DEAL_II_NAMESPACE_OPEN -namespace std_cxx11 -{ - using boost::bind; - using boost::ref; - using boost::cref; - using boost::reference_wrapper; - - // now also import the _1, _2 placeholders from the global namespace - // into the current one as suggested above - using ::_1; - using ::_2; - using ::_3; - using ::_4; - using ::_5; - using ::_6; - using ::_7; - using ::_8; - using ::_9; - - namespace placeholders - { - using ::_1; - using ::_2; - using ::_3; - using ::_4; - using ::_5; - using ::_6; - using ::_7; - using ::_8; - using ::_9; - } -} -DEAL_II_NAMESPACE_CLOSE - -#endif // then allow using the old namespace name instead of the new one DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/base/std_cxx11/condition_variable.h b/include/deal.II/base/std_cxx11/condition_variable.h index 1c1f4be132..ace2f7bde0 100644 --- a/include/deal.II/base/std_cxx11/condition_variable.h +++ b/include/deal.II/base/std_cxx11/condition_variable.h @@ -19,8 +19,6 @@ #include -#ifdef DEAL_II_WITH_CXX11 - # include DEAL_II_NAMESPACE_OPEN namespace std_cxx11 @@ -31,20 +29,6 @@ namespace std_cxx11 } DEAL_II_NAMESPACE_CLOSE -#else - -# include -DEAL_II_NAMESPACE_OPEN -namespace std_cxx11 -{ - using boost::condition_variable; - using boost::unique_lock; - using boost::adopt_lock; -} -DEAL_II_NAMESPACE_CLOSE - -#endif - // then allow using the old namespace name instead of the new one DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; diff --git a/include/deal.II/base/std_cxx11/function.h b/include/deal.II/base/std_cxx11/function.h index ec61d05b11..3b9320a0f0 100644 --- a/include/deal.II/base/std_cxx11/function.h +++ b/include/deal.II/base/std_cxx11/function.h @@ -19,7 +19,6 @@ #include -#ifdef DEAL_II_WITH_CXX11 # include DEAL_II_NAMESPACE_OPEN @@ -29,17 +28,6 @@ namespace std_cxx11 } DEAL_II_NAMESPACE_CLOSE -#else - -#include -DEAL_II_NAMESPACE_OPEN -namespace std_cxx11 -{ - using boost::function; -} -DEAL_II_NAMESPACE_CLOSE - -#endif // then allow using the old namespace name instead of the new one DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/base/std_cxx11/iterator.h b/include/deal.II/base/std_cxx11/iterator.h index 66576e37d0..3962f5b63c 100644 --- a/include/deal.II/base/std_cxx11/iterator.h +++ b/include/deal.II/base/std_cxx11/iterator.h @@ -18,8 +18,6 @@ #include -#ifdef DEAL_II_WITH_CXX11 - # include DEAL_II_NAMESPACE_OPEN namespace std_cxx11 @@ -29,16 +27,4 @@ namespace std_cxx11 } DEAL_II_NAMESPACE_CLOSE -#else - -#include -DEAL_II_NAMESPACE_OPEN -namespace std_cxx11 -{ - using boost::begin; - using boost::end; -} -DEAL_II_NAMESPACE_CLOSE -#endif - #endif diff --git a/include/deal.II/base/std_cxx11/mutex.h b/include/deal.II/base/std_cxx11/mutex.h index a8f8142600..cd3480e599 100644 --- a/include/deal.II/base/std_cxx11/mutex.h +++ b/include/deal.II/base/std_cxx11/mutex.h @@ -19,8 +19,6 @@ #include -#ifdef DEAL_II_WITH_CXX11 - # include DEAL_II_NAMESPACE_OPEN namespace std_cxx11 @@ -29,18 +27,6 @@ namespace std_cxx11 } DEAL_II_NAMESPACE_CLOSE -#else - -# include -DEAL_II_NAMESPACE_OPEN -namespace std_cxx11 -{ - using boost::mutex; -} -DEAL_II_NAMESPACE_CLOSE - -#endif - // then allow using the old namespace name instead of the new one DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; diff --git a/include/deal.II/base/std_cxx11/shared_ptr.h b/include/deal.II/base/std_cxx11/shared_ptr.h index 07ac73cc70..fe7d90a1bd 100644 --- a/include/deal.II/base/std_cxx11/shared_ptr.h +++ b/include/deal.II/base/std_cxx11/shared_ptr.h @@ -19,7 +19,6 @@ #include -#ifdef DEAL_II_WITH_CXX11 # include DEAL_II_NAMESPACE_OPEN @@ -32,22 +31,6 @@ namespace std_cxx11 } DEAL_II_NAMESPACE_CLOSE -#else - -#include -#include -#include -DEAL_II_NAMESPACE_OPEN -namespace std_cxx11 -{ - using boost::shared_ptr; - using boost::enable_shared_from_this; - using boost::make_shared; - using boost::dynamic_pointer_cast; -} -DEAL_II_NAMESPACE_CLOSE - -#endif // then allow using the old namespace name instead of the new one DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/base/std_cxx11/thread.h b/include/deal.II/base/std_cxx11/thread.h index 9a754c4fcf..545927d458 100644 --- a/include/deal.II/base/std_cxx11/thread.h +++ b/include/deal.II/base/std_cxx11/thread.h @@ -19,8 +19,6 @@ #include -#ifdef DEAL_II_WITH_CXX11 - # include DEAL_II_NAMESPACE_OPEN namespace std_cxx11 @@ -29,21 +27,6 @@ namespace std_cxx11 } DEAL_II_NAMESPACE_CLOSE -#else - -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS -# include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS - -DEAL_II_NAMESPACE_OPEN -namespace std_cxx11 -{ - using boost::thread; -} -DEAL_II_NAMESPACE_CLOSE - -#endif - // then allow using the old namespace name instead of the new one DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; diff --git a/include/deal.II/base/std_cxx11/tuple.h b/include/deal.II/base/std_cxx11/tuple.h index 89831a7ca3..5bc76eb55e 100644 --- a/include/deal.II/base/std_cxx11/tuple.h +++ b/include/deal.II/base/std_cxx11/tuple.h @@ -19,8 +19,6 @@ #include -#ifdef DEAL_II_WITH_CXX11 - # include DEAL_II_NAMESPACE_OPEN namespace std_cxx11 @@ -33,37 +31,6 @@ namespace std_cxx11 } DEAL_II_NAMESPACE_CLOSE -#else - -#include -DEAL_II_NAMESPACE_OPEN -namespace std_cxx11 -{ - using boost::tuple; - using boost::make_tuple; - using boost::get; - - // boost::tuples::length has been renamed - // by the standard to std::tuple_size - template - struct tuple_size - { - static const std::size_t value = boost::tuples::length::value; - }; - - // similarly, boost::tuples::element has - // been renamed by the standard to - // std::tuple_element - template - struct tuple_element - { - typedef typename boost::tuples::element::type type; - }; -} -DEAL_II_NAMESPACE_CLOSE - -#endif - // then allow using the old namespace name instead of the new one DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; diff --git a/include/deal.II/base/std_cxx11/type_traits.h b/include/deal.II/base/std_cxx11/type_traits.h index a6f9a89878..7a01d8db02 100644 --- a/include/deal.II/base/std_cxx11/type_traits.h +++ b/include/deal.II/base/std_cxx11/type_traits.h @@ -19,8 +19,6 @@ #include -#ifdef DEAL_II_WITH_CXX11 - # include DEAL_II_NAMESPACE_OPEN namespace std_cxx11 @@ -38,55 +36,6 @@ namespace std_cxx11 } DEAL_II_NAMESPACE_CLOSE -#else - -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS -#include -#include -#if BOOST_VERSION<105600 -#include -#else -#include -#endif -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS - -DEAL_II_NAMESPACE_OPEN -namespace std_cxx11 -{ - using boost::is_fundamental; - using boost::is_pod; - using boost::is_pointer; - - // boost::enable_if_c, *not* boost::enable_if, is equivalent to std::enable_if. - template - struct enable_if : public boost::enable_if_c - {}; - - // boost does not have is_standard_layout and - // is_trivial, but those are both a subset of - // is_pod - template - struct is_standard_layout - { - static const bool value = boost::is_pod::value; - }; - - template - struct is_trivial - { - static const bool value = boost::has_trivial_copy::value && - boost::has_trivial_assign::value && - boost::has_trivial_constructor::value && - boost::has_trivial_destructor::value; - }; - - using boost::true_type; - using boost::false_type; -} -DEAL_II_NAMESPACE_CLOSE - -#endif - // then allow using the old namespace name instead of the new one DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/base/std_cxx11/unique_ptr.h b/include/deal.II/base/std_cxx11/unique_ptr.h index e8d30338db..30db929ab3 100644 --- a/include/deal.II/base/std_cxx11/unique_ptr.h +++ b/include/deal.II/base/std_cxx11/unique_ptr.h @@ -19,7 +19,6 @@ #include -#ifdef DEAL_II_WITH_CXX11 # include DEAL_II_NAMESPACE_OPEN @@ -29,75 +28,6 @@ namespace std_cxx11 } DEAL_II_NAMESPACE_CLOSE -#else - -#include -#include - - -DEAL_II_NAMESPACE_OPEN -namespace std_cxx11 -{ - /** - * Implementation of a basic replacement for C++11's std::unique_ptr class. - * - * BOOST does not have a replacement for std::unique_ptr (because unique_ptr - * requires move semantics that aren't available unless you have a C++11 - * compiler -- in which case you also have std::unique_ptr; see for example - * http://stackoverflow.com/questions/2953530/unique-ptr-boost-equivalent) - * - * Consequently, we emulate the class by just wrapping a boost::scoped_ptr - * in the cheapest possible way -- by just deriving from it and repeating - * the basic constructors. Everything else is inherited from the scoped_ptr - * class. - * - * There is no overhead to this approach: scoped_ptr cannot be copied or - * moved. Instances of unique_ptr cannot be copied, and if you do not have a - * C++11 compiler, then you cannot move anything anyway. - */ - template - class unique_ptr : public boost::scoped_ptr - { - public: - unique_ptr () {} - - template - explicit unique_ptr (Y *p) - : - boost::scoped_ptr(p) - {} - }; - - - template - void save(Archive &ar, - const unique_ptr< T > &t, - const unsigned int version) - { - boost::serialization::save (ar, static_cast&>(t), version); - } - - template - void load(Archive &ar, - unique_ptr< T > &t, - const unsigned int version) - { - boost::serialization::load (ar, static_cast&>(t), version); - } - - template - void serialize(Archive &ar, - unique_ptr< T > &t, - const unsigned int version) - { - boost::serialization::serialize (ar, static_cast&>(t), version); - } - -} -DEAL_II_NAMESPACE_CLOSE - -#endif - // then allow using the old namespace name instead of the new one DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; diff --git a/include/deal.II/base/synchronous_iterator.h b/include/deal.II/base/synchronous_iterator.h index c0c9238d59..ac7e240c8e 100644 --- a/include/deal.II/base/synchronous_iterator.h +++ b/include/deal.II/base/synchronous_iterator.h @@ -20,9 +20,9 @@ #include #include -#include #include +#include DEAL_II_NAMESPACE_OPEN @@ -36,10 +36,10 @@ DEAL_II_NAMESPACE_OPEN * not b.end()) * * The template argument of the current class shall be of type - * std_cxx11::tuple with arguments equal to the iterator types. + * std::tuple with arguments equal to the iterator types. * * The individual iterators can be accessed using - * std_cxx11::get(synchronous_iterator.iterators) where X is + * std::get(synchronous_iterator.iterators) where X is * the number corresponding to the desired iterator. * * This type, and the helper functions associated with it, are used as the @@ -133,7 +133,7 @@ bool operator< (const SynchronousIterators &a, const SynchronousIterators &b) { - return std_cxx11::get<0>(*a) < std_cxx11::get<0>(*b); + return std::get<0>(*a) < std::get<0>(*b); } @@ -151,11 +151,11 @@ std::size_t operator- (const SynchronousIterators &a, const SynchronousIterators &b) { - Assert (std::distance (std_cxx11::get<0>(*b), - std_cxx11::get<0>(*a)) >= 0, + Assert (std::distance (std::get<0>(*b), + std::get<0>(*a)) >= 0, ExcInternalError()); - return std::distance (std_cxx11::get<0>(*b), - std_cxx11::get<0>(*a)); + return std::distance (std::get<0>(*b), + std::get<0>(*a)); } @@ -166,11 +166,11 @@ operator- (const SynchronousIterators &a, */ template inline -void advance (std_cxx11::tuple &t, +void advance (std::tuple &t, const unsigned int n) { - std::advance (std_cxx11::get<0>(t), n); - std::advance (std_cxx11::get<1>(t), n); + std::advance (std::get<0>(t), n); + std::advance (std::get<1>(t), n); } /** @@ -180,12 +180,12 @@ void advance (std_cxx11::tuple &t, */ template inline -void advance (std_cxx11::tuple &t, +void advance (std::tuple &t, const unsigned int n) { - std::advance (std_cxx11::get<0>(t), n); - std::advance (std_cxx11::get<1>(t), n); - std::advance (std_cxx11::get<2>(t), n); + std::advance (std::get<0>(t), n); + std::advance (std::get<1>(t), n); + std::advance (std::get<2>(t), n); } /** @@ -196,13 +196,13 @@ void advance (std_cxx11::tuple &t, template inline -void advance (std_cxx11::tuple &t, +void advance (std::tuple &t, const unsigned int n) { - std::advance (std_cxx11::get<0>(t), n); - std::advance (std_cxx11::get<1>(t), n); - std::advance (std_cxx11::get<2>(t), n); - std::advance (std_cxx11::get<3>(t), n); + std::advance (std::get<0>(t), n); + std::advance (std::get<1>(t), n); + std::advance (std::get<2>(t), n); + std::advance (std::get<3>(t), n); } @@ -214,10 +214,10 @@ void advance (std_cxx11::tuple &t, */ template inline -void advance_by_one (std_cxx11::tuple &t) +void advance_by_one (std::tuple &t) { - ++std_cxx11::get<0>(t); - ++std_cxx11::get<1>(t); + ++std::get<0>(t); + ++std::get<1>(t); } /** @@ -227,11 +227,11 @@ void advance_by_one (std_cxx11::tuple &t) */ template inline -void advance_by_one (std_cxx11::tuple &t) +void advance_by_one (std::tuple &t) { - ++std_cxx11::get<0>(t); - ++std_cxx11::get<1>(t); - ++std_cxx11::get<2>(t); + ++std::get<0>(t); + ++std::get<1>(t); + ++std::get<2>(t); } /** @@ -242,12 +242,12 @@ void advance_by_one (std_cxx11::tuple &t) template inline -void advance_by_one (std_cxx11::tuple &t) +void advance_by_one (std::tuple &t) { - ++std_cxx11::get<0>(t); - ++std_cxx11::get<1>(t); - ++std_cxx11::get<2>(t); - ++std_cxx11::get<3>(t); + ++std::get<0>(t); + ++std::get<1>(t); + ++std::get<2>(t); + ++std::get<3>(t); } @@ -295,8 +295,8 @@ bool operator != (const SynchronousIterators &a, const SynchronousIterators &b) { - return (std_cxx11::get<0>(*a) != - std_cxx11::get<0>(*b)); + return (std::get<0>(*a) != + std::get<0>(*b)); } DEAL_II_NAMESPACE_CLOSE diff --git a/include/deal.II/base/table_indices.h b/include/deal.II/base/table_indices.h index d9cab5a156..cf73345ed9 100644 --- a/include/deal.II/base/table_indices.h +++ b/include/deal.II/base/table_indices.h @@ -19,10 +19,10 @@ #include #include -#include #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -238,7 +238,7 @@ inline void TableIndices::sort () { - std::sort(std_cxx11::begin(indices), std_cxx11::end(indices)); + std::sort(std::begin(indices), std::end(indices)); } diff --git a/include/deal.II/base/thread_management.h b/include/deal.II/base/thread_management.h index 564d093317..5d59d94219 100644 --- a/include/deal.II/base/thread_management.h +++ b/include/deal.II/base/thread_management.h @@ -20,21 +20,20 @@ #include #include #include -#include -#include -#include -#include #ifdef DEAL_II_WITH_THREADS -# include -# include -# include +# include +# include +# include #endif #include #include #include #include +#include +#include +#include #ifdef DEAL_II_WITH_THREADS @@ -335,7 +334,7 @@ namespace Threads /** * Data object storing the mutex data */ - std_cxx11::mutex mutex; + std::mutex mutex; /** * Make the class implementing condition variables a friend, since it @@ -383,8 +382,7 @@ namespace Threads */ inline void wait (Mutex &mutex) { - std_cxx11::unique_lock lock(mutex.mutex, - std_cxx11::adopt_lock); + std::unique_lock lock(mutex.mutex, std::adopt_lock); condition_variable.wait (lock); } @@ -392,7 +390,7 @@ namespace Threads /** * Data object storing the necessary data. */ - std_cxx11::condition_variable condition_variable; + std::condition_variable condition_variable; }; @@ -754,14 +752,14 @@ namespace Threads namespace internal { template - inline void call (const std_cxx11::function &function, + inline void call (const std::function &function, internal::return_value &ret_val) { ret_val.set (function()); } - inline void call (const std_cxx11::function &function, + inline void call (const std::function &function, internal::return_value &) { function(); @@ -782,7 +780,7 @@ namespace Threads * arguments. */ template ::value> + int length = std::tuple_size::value> struct fun_ptr_helper; @@ -808,7 +806,7 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx11::tuple_element<0,ArgList>::type); + typedef RT (type) (typename std::tuple_element<0,ArgList>::type); }; @@ -821,8 +819,8 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx11::tuple_element<0,ArgList>::type, - typename std_cxx11::tuple_element<1,ArgList>::type); + typedef RT (type) (typename std::tuple_element<0,ArgList>::type, + typename std::tuple_element<1,ArgList>::type); }; @@ -835,9 +833,9 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx11::tuple_element<0,ArgList>::type, - typename std_cxx11::tuple_element<1,ArgList>::type, - typename std_cxx11::tuple_element<2,ArgList>::type); + typedef RT (type) (typename std::tuple_element<0,ArgList>::type, + typename std::tuple_element<1,ArgList>::type, + typename std::tuple_element<2,ArgList>::type); }; @@ -850,10 +848,10 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx11::tuple_element<0,ArgList>::type, - typename std_cxx11::tuple_element<1,ArgList>::type, - typename std_cxx11::tuple_element<2,ArgList>::type, - typename std_cxx11::tuple_element<3,ArgList>::type); + typedef RT (type) (typename std::tuple_element<0,ArgList>::type, + typename std::tuple_element<1,ArgList>::type, + typename std::tuple_element<2,ArgList>::type, + typename std::tuple_element<3,ArgList>::type); }; @@ -866,11 +864,11 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx11::tuple_element<0,ArgList>::type, - typename std_cxx11::tuple_element<1,ArgList>::type, - typename std_cxx11::tuple_element<2,ArgList>::type, - typename std_cxx11::tuple_element<3,ArgList>::type, - typename std_cxx11::tuple_element<4,ArgList>::type); + typedef RT (type) (typename std::tuple_element<0,ArgList>::type, + typename std::tuple_element<1,ArgList>::type, + typename std::tuple_element<2,ArgList>::type, + typename std::tuple_element<3,ArgList>::type, + typename std::tuple_element<4,ArgList>::type); }; @@ -883,12 +881,12 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx11::tuple_element<0,ArgList>::type, - typename std_cxx11::tuple_element<1,ArgList>::type, - typename std_cxx11::tuple_element<2,ArgList>::type, - typename std_cxx11::tuple_element<3,ArgList>::type, - typename std_cxx11::tuple_element<4,ArgList>::type, - typename std_cxx11::tuple_element<5,ArgList>::type); + typedef RT (type) (typename std::tuple_element<0,ArgList>::type, + typename std::tuple_element<1,ArgList>::type, + typename std::tuple_element<2,ArgList>::type, + typename std::tuple_element<3,ArgList>::type, + typename std::tuple_element<4,ArgList>::type, + typename std::tuple_element<5,ArgList>::type); }; @@ -901,13 +899,13 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx11::tuple_element<0,ArgList>::type, - typename std_cxx11::tuple_element<1,ArgList>::type, - typename std_cxx11::tuple_element<2,ArgList>::type, - typename std_cxx11::tuple_element<3,ArgList>::type, - typename std_cxx11::tuple_element<4,ArgList>::type, - typename std_cxx11::tuple_element<5,ArgList>::type, - typename std_cxx11::tuple_element<6,ArgList>::type); + typedef RT (type) (typename std::tuple_element<0,ArgList>::type, + typename std::tuple_element<1,ArgList>::type, + typename std::tuple_element<2,ArgList>::type, + typename std::tuple_element<3,ArgList>::type, + typename std::tuple_element<4,ArgList>::type, + typename std::tuple_element<5,ArgList>::type, + typename std::tuple_element<6,ArgList>::type); }; @@ -920,14 +918,14 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx11::tuple_element<0,ArgList>::type, - typename std_cxx11::tuple_element<1,ArgList>::type, - typename std_cxx11::tuple_element<2,ArgList>::type, - typename std_cxx11::tuple_element<3,ArgList>::type, - typename std_cxx11::tuple_element<4,ArgList>::type, - typename std_cxx11::tuple_element<5,ArgList>::type, - typename std_cxx11::tuple_element<6,ArgList>::type, - typename std_cxx11::tuple_element<7,ArgList>::type); + typedef RT (type) (typename std::tuple_element<0,ArgList>::type, + typename std::tuple_element<1,ArgList>::type, + typename std::tuple_element<2,ArgList>::type, + typename std::tuple_element<3,ArgList>::type, + typename std::tuple_element<4,ArgList>::type, + typename std::tuple_element<5,ArgList>::type, + typename std::tuple_element<6,ArgList>::type, + typename std::tuple_element<7,ArgList>::type); }; @@ -940,15 +938,15 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx11::tuple_element<0,ArgList>::type, - typename std_cxx11::tuple_element<1,ArgList>::type, - typename std_cxx11::tuple_element<2,ArgList>::type, - typename std_cxx11::tuple_element<3,ArgList>::type, - typename std_cxx11::tuple_element<4,ArgList>::type, - typename std_cxx11::tuple_element<5,ArgList>::type, - typename std_cxx11::tuple_element<6,ArgList>::type, - typename std_cxx11::tuple_element<7,ArgList>::type, - typename std_cxx11::tuple_element<8,ArgList>::type); + typedef RT (type) (typename std::tuple_element<0,ArgList>::type, + typename std::tuple_element<1,ArgList>::type, + typename std::tuple_element<2,ArgList>::type, + typename std::tuple_element<3,ArgList>::type, + typename std::tuple_element<4,ArgList>::type, + typename std::tuple_element<5,ArgList>::type, + typename std::tuple_element<6,ArgList>::type, + typename std::tuple_element<7,ArgList>::type, + typename std::tuple_element<8,ArgList>::type); }; @@ -962,16 +960,16 @@ namespace Threads template struct fun_ptr_helper { - typedef RT (type) (typename std_cxx11::tuple_element<0,ArgList>::type, - typename std_cxx11::tuple_element<1,ArgList>::type, - typename std_cxx11::tuple_element<2,ArgList>::type, - typename std_cxx11::tuple_element<3,ArgList>::type, - typename std_cxx11::tuple_element<4,ArgList>::type, - typename std_cxx11::tuple_element<5,ArgList>::type, - typename std_cxx11::tuple_element<6,ArgList>::type, - typename std_cxx11::tuple_element<7,ArgList>::type, - typename std_cxx11::tuple_element<8,ArgList>::type, - typename std_cxx11::tuple_element<9,ArgList>::type); + typedef RT (type) (typename std::tuple_element<0,ArgList>::type, + typename std::tuple_element<1,ArgList>::type, + typename std::tuple_element<2,ArgList>::type, + typename std::tuple_element<3,ArgList>::type, + typename std::tuple_element<4,ArgList>::type, + typename std::tuple_element<5,ArgList>::type, + typename std::tuple_element<6,ArgList>::type, + typename std::tuple_element<7,ArgList>::type, + typename std::tuple_element<8,ArgList>::type, + typename std::tuple_element<9,ArgList>::type); }; @@ -1015,7 +1013,7 @@ namespace Threads /** * An object that represents the thread started. */ - std_cxx11::thread thread; + std::thread thread; /** * An object that will hold the value returned by the function called on @@ -1025,7 +1023,7 @@ namespace Threads * the the ThreadDescriptor. This makes sure the object stays alive * until the thread exits. */ - std_cxx11::shared_ptr > ret_val; + std::shared_ptr > ret_val; /** * A bool variable that is initially false, is set to true when a new @@ -1085,11 +1083,11 @@ namespace Threads * Start the thread and let it put its return value into the ret_val * object. */ - void start (const std_cxx11::function &function) + void start (const std::function &function) { thread_is_active = true; ret_val.reset(new return_value()); - thread = std_cxx11::thread (thread_entry_point, function, ret_val); + thread = std::thread (thread_entry_point, function, ret_val); } @@ -1119,8 +1117,8 @@ namespace Threads * The function that runs on the thread. */ static - void thread_entry_point (const std_cxx11::function function, - std_cxx11::shared_ptr > ret_val) + void thread_entry_point (const std::function function, + std::shared_ptr > ret_val) { // call the function in question. since an exception that is // thrown from one of the called functions will not propagate @@ -1160,13 +1158,13 @@ namespace Threads * An object that will hold the value returned by the function called on * the thread. */ - std_cxx11::shared_ptr > ret_val; + std::shared_ptr > ret_val; /** * Start the thread and let it put its return value into the ret_val * object. */ - void start (const std_cxx11::function &function) + void start (const std::function &function) { ret_val.reset(new return_value()); call (function, *ret_val); @@ -1212,7 +1210,7 @@ namespace Threads /** * Construct a thread object with a function object. */ - Thread (const std_cxx11::function &function) + Thread (const std::function &function) : thread_descriptor (new internal::ThreadDescriptor()) { @@ -1283,14 +1281,14 @@ namespace Threads * implementation will make sure that that object lives as long as there * is at least one subscriber to it. */ - std_cxx11::shared_ptr > thread_descriptor; + std::shared_ptr > thread_descriptor; }; namespace internal { /** - * A general template that returns std_cxx11::ref(t) if t is of reference + * A general template that returns std::ref(t) if t is of reference * type, and t otherwise. * * The case that t is of reference type is handled in a partial @@ -1308,7 +1306,7 @@ namespace Threads /** - * A general template that returns std_cxx11::ref(t) if t is of reference + * A general template that returns std::ref(t) if t is of reference * type, and t otherwise. * * The case that t is of reference type is handled in this partial @@ -1317,9 +1315,9 @@ namespace Threads template struct maybe_make_ref { - static std_cxx11::reference_wrapper act (T &t) + static std::reference_wrapper act (T &t) { - return std_cxx11::ref(t); + return std::ref(t); } }; } @@ -1360,7 +1358,7 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx11::function::type> &function) + fun_encapsulator (const std::function::type> &function) : function (function) {} @@ -1372,7 +1370,7 @@ namespace Threads } private: - std_cxx11::function::type> function; + std::function::type> function; }; /** @@ -1388,22 +1386,22 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx11::function::type> &function) + fun_encapsulator (const std::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx11::tuple_element<0,ArgList>::type arg1) + operator() (typename std::tuple_element<0,ArgList>::type arg1) { return Thread - (std_cxx11::bind (function, - internal::maybe_make_ref::type>::act(arg1))); + (std::bind (function, + internal::maybe_make_ref::type>::act(arg1))); } private: - std_cxx11::function::type> function; + std::function::type> function; }; /** @@ -1419,24 +1417,24 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx11::function::type> &function) + fun_encapsulator (const std::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx11::tuple_element<0,ArgList>::type arg1, - typename std_cxx11::tuple_element<1,ArgList>::type arg2) + operator() (typename std::tuple_element<0,ArgList>::type arg1, + typename std::tuple_element<1,ArgList>::type arg2) { return Thread - (std_cxx11::bind (function, - internal::maybe_make_ref::type>::act(arg1), - internal::maybe_make_ref::type>::act(arg2))); + (std::bind (function, + internal::maybe_make_ref::type>::act(arg1), + internal::maybe_make_ref::type>::act(arg2))); } private: - std_cxx11::function::type> function; + std::function::type> function; }; /** @@ -1452,26 +1450,26 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx11::function::type> &function) + fun_encapsulator (const std::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx11::tuple_element<0,ArgList>::type arg1, - typename std_cxx11::tuple_element<1,ArgList>::type arg2, - typename std_cxx11::tuple_element<2,ArgList>::type arg3) + operator() (typename std::tuple_element<0,ArgList>::type arg1, + typename std::tuple_element<1,ArgList>::type arg2, + typename std::tuple_element<2,ArgList>::type arg3) { return Thread - (std_cxx11::bind (function, - internal::maybe_make_ref::type>::act(arg1), - internal::maybe_make_ref::type>::act(arg2), - internal::maybe_make_ref::type>::act(arg3))); + (std::bind (function, + internal::maybe_make_ref::type>::act(arg1), + internal::maybe_make_ref::type>::act(arg2), + internal::maybe_make_ref::type>::act(arg3))); } private: - std_cxx11::function::type> function; + std::function::type> function; }; /** @@ -1487,28 +1485,28 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx11::function::type> &function) + fun_encapsulator (const std::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx11::tuple_element<0,ArgList>::type arg1, - typename std_cxx11::tuple_element<1,ArgList>::type arg2, - typename std_cxx11::tuple_element<2,ArgList>::type arg3, - typename std_cxx11::tuple_element<3,ArgList>::type arg4) + operator() (typename std::tuple_element<0,ArgList>::type arg1, + typename std::tuple_element<1,ArgList>::type arg2, + typename std::tuple_element<2,ArgList>::type arg3, + typename std::tuple_element<3,ArgList>::type arg4) { return Thread - (std_cxx11::bind (function, - internal::maybe_make_ref::type>::act(arg1), - internal::maybe_make_ref::type>::act(arg2), - internal::maybe_make_ref::type>::act(arg3), - internal::maybe_make_ref::type>::act(arg4))); + (std::bind (function, + internal::maybe_make_ref::type>::act(arg1), + internal::maybe_make_ref::type>::act(arg2), + internal::maybe_make_ref::type>::act(arg3), + internal::maybe_make_ref::type>::act(arg4))); } private: - std_cxx11::function::type> function; + std::function::type> function; }; /** @@ -1524,30 +1522,30 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx11::function::type> &function) + fun_encapsulator (const std::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx11::tuple_element<0,ArgList>::type arg1, - typename std_cxx11::tuple_element<1,ArgList>::type arg2, - typename std_cxx11::tuple_element<2,ArgList>::type arg3, - typename std_cxx11::tuple_element<3,ArgList>::type arg4, - typename std_cxx11::tuple_element<4,ArgList>::type arg5) + operator() (typename std::tuple_element<0,ArgList>::type arg1, + typename std::tuple_element<1,ArgList>::type arg2, + typename std::tuple_element<2,ArgList>::type arg3, + typename std::tuple_element<3,ArgList>::type arg4, + typename std::tuple_element<4,ArgList>::type arg5) { return Thread - (std_cxx11::bind (function, - internal::maybe_make_ref::type>::act(arg1), - internal::maybe_make_ref::type>::act(arg2), - internal::maybe_make_ref::type>::act(arg3), - internal::maybe_make_ref::type>::act(arg4), - internal::maybe_make_ref::type>::act(arg5))); + (std::bind (function, + internal::maybe_make_ref::type>::act(arg1), + internal::maybe_make_ref::type>::act(arg2), + internal::maybe_make_ref::type>::act(arg3), + internal::maybe_make_ref::type>::act(arg4), + internal::maybe_make_ref::type>::act(arg5))); } private: - std_cxx11::function::type> function; + std::function::type> function; }; /** @@ -1563,32 +1561,32 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx11::function::type> &function) + fun_encapsulator (const std::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx11::tuple_element<0,ArgList>::type arg1, - typename std_cxx11::tuple_element<1,ArgList>::type arg2, - typename std_cxx11::tuple_element<2,ArgList>::type arg3, - typename std_cxx11::tuple_element<3,ArgList>::type arg4, - typename std_cxx11::tuple_element<4,ArgList>::type arg5, - typename std_cxx11::tuple_element<5,ArgList>::type arg6) + operator() (typename std::tuple_element<0,ArgList>::type arg1, + typename std::tuple_element<1,ArgList>::type arg2, + typename std::tuple_element<2,ArgList>::type arg3, + typename std::tuple_element<3,ArgList>::type arg4, + typename std::tuple_element<4,ArgList>::type arg5, + typename std::tuple_element<5,ArgList>::type arg6) { return Thread - (std_cxx11::bind (function, - internal::maybe_make_ref::type>::act(arg1), - internal::maybe_make_ref::type>::act(arg2), - internal::maybe_make_ref::type>::act(arg3), - internal::maybe_make_ref::type>::act(arg4), - internal::maybe_make_ref::type>::act(arg5), - internal::maybe_make_ref::type>::act(arg6))); + (std::bind (function, + internal::maybe_make_ref::type>::act(arg1), + internal::maybe_make_ref::type>::act(arg2), + internal::maybe_make_ref::type>::act(arg3), + internal::maybe_make_ref::type>::act(arg4), + internal::maybe_make_ref::type>::act(arg5), + internal::maybe_make_ref::type>::act(arg6))); } private: - std_cxx11::function::type> function; + std::function::type> function; }; /** @@ -1604,34 +1602,34 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx11::function::type> &function) + fun_encapsulator (const std::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx11::tuple_element<0,ArgList>::type arg1, - typename std_cxx11::tuple_element<1,ArgList>::type arg2, - typename std_cxx11::tuple_element<2,ArgList>::type arg3, - typename std_cxx11::tuple_element<3,ArgList>::type arg4, - typename std_cxx11::tuple_element<4,ArgList>::type arg5, - typename std_cxx11::tuple_element<5,ArgList>::type arg6, - typename std_cxx11::tuple_element<6,ArgList>::type arg7) + operator() (typename std::tuple_element<0,ArgList>::type arg1, + typename std::tuple_element<1,ArgList>::type arg2, + typename std::tuple_element<2,ArgList>::type arg3, + typename std::tuple_element<3,ArgList>::type arg4, + typename std::tuple_element<4,ArgList>::type arg5, + typename std::tuple_element<5,ArgList>::type arg6, + typename std::tuple_element<6,ArgList>::type arg7) { return Thread - (std_cxx11::bind (function, - internal::maybe_make_ref::type>::act(arg1), - internal::maybe_make_ref::type>::act(arg2), - internal::maybe_make_ref::type>::act(arg3), - internal::maybe_make_ref::type>::act(arg4), - internal::maybe_make_ref::type>::act(arg5), - internal::maybe_make_ref::type>::act(arg6), - internal::maybe_make_ref::type>::act(arg7))); + (std::bind (function, + internal::maybe_make_ref::type>::act(arg1), + internal::maybe_make_ref::type>::act(arg2), + internal::maybe_make_ref::type>::act(arg3), + internal::maybe_make_ref::type>::act(arg4), + internal::maybe_make_ref::type>::act(arg5), + internal::maybe_make_ref::type>::act(arg6), + internal::maybe_make_ref::type>::act(arg7))); } private: - std_cxx11::function::type> function; + std::function::type> function; }; /** @@ -1647,36 +1645,36 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx11::function::type> &function) + fun_encapsulator (const std::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx11::tuple_element<0,ArgList>::type arg1, - typename std_cxx11::tuple_element<1,ArgList>::type arg2, - typename std_cxx11::tuple_element<2,ArgList>::type arg3, - typename std_cxx11::tuple_element<3,ArgList>::type arg4, - typename std_cxx11::tuple_element<4,ArgList>::type arg5, - typename std_cxx11::tuple_element<5,ArgList>::type arg6, - typename std_cxx11::tuple_element<6,ArgList>::type arg7, - typename std_cxx11::tuple_element<7,ArgList>::type arg8) + operator() (typename std::tuple_element<0,ArgList>::type arg1, + typename std::tuple_element<1,ArgList>::type arg2, + typename std::tuple_element<2,ArgList>::type arg3, + typename std::tuple_element<3,ArgList>::type arg4, + typename std::tuple_element<4,ArgList>::type arg5, + typename std::tuple_element<5,ArgList>::type arg6, + typename std::tuple_element<6,ArgList>::type arg7, + typename std::tuple_element<7,ArgList>::type arg8) { return Thread - (std_cxx11::bind (function, - internal::maybe_make_ref::type>::act(arg1), - internal::maybe_make_ref::type>::act(arg2), - internal::maybe_make_ref::type>::act(arg3), - internal::maybe_make_ref::type>::act(arg4), - internal::maybe_make_ref::type>::act(arg5), - internal::maybe_make_ref::type>::act(arg6), - internal::maybe_make_ref::type>::act(arg7), - internal::maybe_make_ref::type>::act(arg8))); + (std::bind (function, + internal::maybe_make_ref::type>::act(arg1), + internal::maybe_make_ref::type>::act(arg2), + internal::maybe_make_ref::type>::act(arg3), + internal::maybe_make_ref::type>::act(arg4), + internal::maybe_make_ref::type>::act(arg5), + internal::maybe_make_ref::type>::act(arg6), + internal::maybe_make_ref::type>::act(arg7), + internal::maybe_make_ref::type>::act(arg8))); } private: - std_cxx11::function::type> function; + std::function::type> function; }; /** @@ -1692,38 +1690,38 @@ namespace Threads : function (*function) {} - fun_encapsulator (const std_cxx11::function::type> &function) + fun_encapsulator (const std::function::type> &function) : function (function) {} inline Thread - operator() (typename std_cxx11::tuple_element<0,ArgList>::type arg1, - typename std_cxx11::tuple_element<1,ArgList>::type arg2, - typename std_cxx11::tuple_element<2,ArgList>::type arg3, - typename std_cxx11::tuple_element<3,ArgList>::type arg4, - typename std_cxx11::tuple_element<4,ArgList>::type arg5, - typename std_cxx11::tuple_element<5,ArgList>::type arg6, - typename std_cxx11::tuple_element<6,ArgList>::type arg7, - typename std_cxx11::tuple_element<7,ArgList>::type arg8, - typename std_cxx11::tuple_element<8,ArgList>::type arg9) + operator() (typename std::tuple_element<0,ArgList>::type arg1, + typename std::tuple_element<1,ArgList>::type arg2, + typename std::tuple_element<2,ArgList>::type arg3, + typename std::tuple_element<3,ArgList>::type arg4, + typename std::tuple_element<4,ArgList>::type arg5, + typename std::tuple_element<5,ArgList>::type arg6, + typename std::tuple_element<6,ArgList>::type arg7, + typename std::tuple_element<7,ArgList>::type arg8, + typename std::tuple_element<8,ArgList>::type arg9) { return Thread - (std_cxx11::bind (function, - internal::maybe_make_ref::type>::act(arg1), - internal::maybe_make_ref::type>::act(arg2), - internal::maybe_make_ref::type>::act(arg3), - internal::maybe_make_ref::type>::act(arg4), - internal::maybe_make_ref::type>::act(arg5), - internal::maybe_make_ref::type>::act(arg6), - internal::maybe_make_ref::type>::act(arg7), - internal::maybe_make_ref::type>::act(arg8), - internal::maybe_make_ref::type>::act(arg9))); + (std::bind (function, + internal::maybe_make_ref::type>::act(arg1), + internal::maybe_make_ref::type>::act(arg2), + internal::maybe_make_ref::type>::act(arg3), + internal::maybe_make_ref::type>::act(arg4), + internal::maybe_make_ref::type>::act(arg5), + internal::maybe_make_ref::type>::act(arg6), + internal::maybe_make_ref::type>::act(arg7), + internal::maybe_make_ref::type>::act(arg8), + internal::maybe_make_ref::type>::act(arg9))); } private: - std_cxx11::function::type> function; + std::function::type> function; }; } @@ -1733,7 +1731,7 @@ namespace Threads /** * Overload of the new_thread function for objects that can be converted to - * std_cxx11::function, i.e. anything that can be called like a + * std::function, i.e. anything that can be called like a * function object without arguments and returning an object of type RT (or * void). * @@ -1742,7 +1740,7 @@ namespace Threads template inline Thread - new_thread (const std_cxx11::function &function) + new_thread (const std::function &function) { return Thread(function); } @@ -1820,7 +1818,7 @@ namespace Threads -> Thread { typedef decltype(function_object()) return_type; - return Thread(std_cxx11::function(function_object)); + return Thread(std::function(function_object)); } #endif @@ -1837,7 +1835,7 @@ namespace Threads Thread new_thread (RT (*fun_ptr)()) { - return new_thread (std_cxx11::function (fun_ptr)); + return new_thread (std::function (fun_ptr)); } @@ -1854,8 +1852,8 @@ namespace Threads typename identity::type &c) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c)))); + new_thread (std::function + (std::bind(fun_ptr, std::ref(c)))); } @@ -1873,8 +1871,8 @@ namespace Threads const typename identity::type &c) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c)))); + new_thread (std::function + (std::bind(fun_ptr, std::cref(c)))); } #endif @@ -1895,9 +1893,9 @@ namespace Threads typename identity::type arg1) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1)))); + new_thread (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1)))); } @@ -1916,9 +1914,9 @@ namespace Threads typename identity::type arg1) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1)))); + new_thread (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -1936,9 +1934,9 @@ namespace Threads typename identity::type arg1) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1)))); + new_thread (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1)))); } #endif @@ -1958,10 +1956,10 @@ namespace Threads typename identity::type arg2) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2)))); + new_thread (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2)))); } @@ -1981,10 +1979,10 @@ namespace Threads typename identity::type arg2) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2)))); + new_thread (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -2003,10 +2001,10 @@ namespace Threads typename identity::type arg2) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2)))); + new_thread (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2)))); } #endif @@ -2028,11 +2026,11 @@ namespace Threads typename identity::type arg3) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3)))); + new_thread (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3)))); } @@ -2054,11 +2052,11 @@ namespace Threads typename identity::type arg3) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3)))); + new_thread (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -2079,11 +2077,11 @@ namespace Threads typename identity::type arg3) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3)))); + new_thread (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3)))); } #endif @@ -2107,12 +2105,12 @@ namespace Threads typename identity::type arg4) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4)))); + new_thread (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4)))); } @@ -2135,12 +2133,12 @@ namespace Threads typename identity::type arg4) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4)))); + new_thread (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -2162,12 +2160,12 @@ namespace Threads typename identity::type arg4) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4)))); + new_thread (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4)))); } #endif @@ -2192,13 +2190,13 @@ namespace Threads typename identity::type arg5) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5)))); + new_thread (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5)))); } @@ -2223,13 +2221,13 @@ namespace Threads typename identity::type arg5) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5)))); + new_thread (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -2253,13 +2251,13 @@ namespace Threads typename identity::type arg5) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5)))); + new_thread (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5)))); } #endif @@ -2285,14 +2283,14 @@ namespace Threads typename identity::type arg6) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6)))); + new_thread (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6)))); } @@ -2318,14 +2316,14 @@ namespace Threads typename identity::type arg6) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6)))); + new_thread (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -2350,14 +2348,14 @@ namespace Threads typename identity::type arg6) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6)))); + new_thread (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6)))); } #endif @@ -2385,15 +2383,15 @@ namespace Threads typename identity::type arg7) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7)))); + new_thread (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7)))); } @@ -2421,15 +2419,15 @@ namespace Threads typename identity::type arg7) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7)))); + new_thread (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -2456,15 +2454,15 @@ namespace Threads typename identity::type arg7) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7)))); + new_thread (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7)))); } #endif @@ -2494,16 +2492,16 @@ namespace Threads typename identity::type arg8) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7), - internal::maybe_make_ref::act(arg8)))); + new_thread (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7), + internal::maybe_make_ref::act(arg8)))); } @@ -2533,16 +2531,16 @@ namespace Threads typename identity::type arg8) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7), - internal::maybe_make_ref::act(arg8)))); + new_thread (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7), + internal::maybe_make_ref::act(arg8)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -2571,16 +2569,16 @@ namespace Threads typename identity::type arg8) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7), - internal::maybe_make_ref::act(arg8)))); + new_thread (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7), + internal::maybe_make_ref::act(arg8)))); } #endif @@ -2611,17 +2609,17 @@ namespace Threads typename identity::type arg9) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7), - internal::maybe_make_ref::act(arg8), - internal::maybe_make_ref::act(arg9)))); + new_thread (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7), + internal::maybe_make_ref::act(arg8), + internal::maybe_make_ref::act(arg9)))); } @@ -2652,17 +2650,17 @@ namespace Threads typename identity::type arg9) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7), - internal::maybe_make_ref::act(arg8), - internal::maybe_make_ref::act(arg9)))); + new_thread (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7), + internal::maybe_make_ref::act(arg8), + internal::maybe_make_ref::act(arg9)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -2692,17 +2690,17 @@ namespace Threads typename identity::type arg9) { return - new_thread (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7), - internal::maybe_make_ref::act(arg8), - internal::maybe_make_ref::act(arg9)))); + new_thread (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7), + internal::maybe_make_ref::act(arg8), + internal::maybe_make_ref::act(arg9)))); } #endif @@ -2823,7 +2821,7 @@ namespace Threads /** * The function and its arguments that are to be run on the task. */ - std_cxx11::function function; + std::function function; /** * Variable holding the data the TBB needs to work with a task. Set by @@ -2850,7 +2848,7 @@ namespace Threads /** * Constructor. Take the function to be run on this task as argument. */ - TaskDescriptor (const std_cxx11::function &function); + TaskDescriptor (const std::function &function); /** * Default constructor. Throws an exception since we want to queue a @@ -2901,7 +2899,7 @@ namespace Threads template inline - TaskDescriptor::TaskDescriptor (const std_cxx11::function &function) + TaskDescriptor::TaskDescriptor (const std::function &function) : function (function), task(NULL), @@ -3033,7 +3031,7 @@ namespace Threads * Constructor. Call the given function and emplace the return value * into the slot reserved for this purpose. */ - TaskDescriptor (const std_cxx11::function &function) + TaskDescriptor (const std::function &function) { call (function, ret_val); } @@ -3078,7 +3076,7 @@ namespace Threads * @post Using this constructor automatically makes the task object * joinable(). */ - Task (const std_cxx11::function &function_object) + Task (const std::function &function_object) { // create a task descriptor and tell it to queue itself up with // the scheduling system @@ -3141,7 +3139,7 @@ namespace Threads bool joinable () const { return (task_descriptor != - std_cxx11::shared_ptr >()); + std::shared_ptr >()); } @@ -3192,14 +3190,14 @@ namespace Threads * pointer implementation will make sure that that object lives as long as * there is at least one subscriber to it. */ - std_cxx11::shared_ptr > task_descriptor; + std::shared_ptr > task_descriptor; }; /** * Overload of the new_task function for objects that can be converted to - * std_cxx11::function, i.e. anything that can be called like a + * std::function, i.e. anything that can be called like a * function object without arguments and returning an object of type RT (or * void). * @@ -3208,7 +3206,7 @@ namespace Threads template inline Task - new_task (const std_cxx11::function &function) + new_task (const std::function &function) { return Task(function); } @@ -3286,7 +3284,7 @@ namespace Threads -> Task { typedef decltype(function_object()) return_type; - return Task(std_cxx11::function(function_object)); + return Task(std::function(function_object)); } #endif @@ -3302,7 +3300,7 @@ namespace Threads Task new_task (RT (*fun_ptr)()) { - return new_task (std_cxx11::function(fun_ptr)); + return new_task (std::function(fun_ptr)); } @@ -3319,8 +3317,8 @@ namespace Threads typename identity::type &c) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c)))); + new_task (std::function + (std::bind(fun_ptr, std::ref(c)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -3337,8 +3335,8 @@ namespace Threads const typename identity::type &c) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c)))); + new_task (std::function + (std::bind(fun_ptr, std::cref(c)))); } #endif @@ -3359,9 +3357,9 @@ namespace Threads typename identity::type arg1) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1)))); + new_task (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1)))); } @@ -3380,9 +3378,9 @@ namespace Threads typename identity::type arg1) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1)))); + new_task (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -3400,9 +3398,9 @@ namespace Threads typename identity::type arg1) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1)))); + new_task (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1)))); } #endif @@ -3422,10 +3420,10 @@ namespace Threads typename identity::type arg2) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2)))); + new_task (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2)))); } @@ -3445,10 +3443,10 @@ namespace Threads typename identity::type arg2) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2)))); + new_task (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -3467,10 +3465,10 @@ namespace Threads typename identity::type arg2) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2)))); + new_task (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2)))); } #endif @@ -3492,11 +3490,11 @@ namespace Threads typename identity::type arg3) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3)))); + new_task (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3)))); } @@ -3518,11 +3516,11 @@ namespace Threads typename identity::type arg3) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3)))); + new_task (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -3543,11 +3541,11 @@ namespace Threads typename identity::type arg3) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3)))); + new_task (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3)))); } #endif @@ -3571,12 +3569,12 @@ namespace Threads typename identity::type arg4) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4)))); + new_task (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4)))); } @@ -3599,12 +3597,12 @@ namespace Threads typename identity::type arg4) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4)))); + new_task (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -3626,12 +3624,12 @@ namespace Threads typename identity::type arg4) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4)))); + new_task (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4)))); } #endif @@ -3656,13 +3654,13 @@ namespace Threads typename identity::type arg5) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5)))); + new_task (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5)))); } @@ -3687,13 +3685,13 @@ namespace Threads typename identity::type arg5) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5)))); + new_task (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -3717,13 +3715,13 @@ namespace Threads typename identity::type arg5) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5)))); + new_task (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5)))); } #endif @@ -3749,14 +3747,14 @@ namespace Threads typename identity::type arg6) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6)))); + new_task (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6)))); } @@ -3782,14 +3780,14 @@ namespace Threads typename identity::type arg6) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6)))); + new_task (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -3814,14 +3812,14 @@ namespace Threads typename identity::type arg6) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6)))); + new_task (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6)))); } #endif @@ -3849,15 +3847,15 @@ namespace Threads typename identity::type arg7) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7)))); + new_task (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7)))); } @@ -3885,15 +3883,15 @@ namespace Threads typename identity::type arg7) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7)))); + new_task (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -3920,15 +3918,15 @@ namespace Threads typename identity::type arg7) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7)))); + new_task (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7)))); } #endif @@ -3958,16 +3956,16 @@ namespace Threads typename identity::type arg8) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7), - internal::maybe_make_ref::act(arg8)))); + new_task (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7), + internal::maybe_make_ref::act(arg8)))); } @@ -3997,16 +3995,16 @@ namespace Threads typename identity::type arg8) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7), - internal::maybe_make_ref::act(arg8)))); + new_task (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7), + internal::maybe_make_ref::act(arg8)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -4035,16 +4033,16 @@ namespace Threads typename identity::type arg8) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7), - internal::maybe_make_ref::act(arg8)))); + new_task (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7), + internal::maybe_make_ref::act(arg8)))); } #endif @@ -4075,17 +4073,17 @@ namespace Threads typename identity::type arg9) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7), - internal::maybe_make_ref::act(arg8), - internal::maybe_make_ref::act(arg9)))); + new_task (std::function + (std::bind(fun_ptr, + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7), + internal::maybe_make_ref::act(arg8), + internal::maybe_make_ref::act(arg9)))); } @@ -4116,17 +4114,17 @@ namespace Threads typename identity::type arg9) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::ref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7), - internal::maybe_make_ref::act(arg8), - internal::maybe_make_ref::act(arg9)))); + new_task (std::function + (std::bind(fun_ptr, std::ref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7), + internal::maybe_make_ref::act(arg8), + internal::maybe_make_ref::act(arg9)))); } #ifndef DEAL_II_CONST_MEMBER_DEDUCTION_BUG @@ -4156,17 +4154,17 @@ namespace Threads typename identity::type arg9) { return - new_task (std_cxx11::function - (std_cxx11::bind(fun_ptr, std_cxx11::cref(c), - internal::maybe_make_ref::act(arg1), - internal::maybe_make_ref::act(arg2), - internal::maybe_make_ref::act(arg3), - internal::maybe_make_ref::act(arg4), - internal::maybe_make_ref::act(arg5), - internal::maybe_make_ref::act(arg6), - internal::maybe_make_ref::act(arg7), - internal::maybe_make_ref::act(arg8), - internal::maybe_make_ref::act(arg9)))); + new_task (std::function + (std::bind(fun_ptr, std::cref(c), + internal::maybe_make_ref::act(arg1), + internal::maybe_make_ref::act(arg2), + internal::maybe_make_ref::act(arg3), + internal::maybe_make_ref::act(arg4), + internal::maybe_make_ref::act(arg5), + internal::maybe_make_ref::act(arg6), + internal::maybe_make_ref::act(arg7), + internal::maybe_make_ref::act(arg8), + internal::maybe_make_ref::act(arg9)))); } #endif diff --git a/include/deal.II/base/time_stepping.h b/include/deal.II/base/time_stepping.h index cbe40d57e6..34170a22a6 100644 --- a/include/deal.II/base/time_stepping.h +++ b/include/deal.II/base/time_stepping.h @@ -19,8 +19,8 @@ #include #include -#include +#include #include DEAL_II_NAMESPACE_OPEN @@ -96,11 +96,11 @@ namespace TimeStepping * function returns the time at the end of the time step. */ virtual double evolve_one_time_step - (std::vector > &F, - std::vector > &J_inverse, - double t, - double delta_t, - VectorType &y) = 0; + (std::vector > &F, + std::vector > &J_inverse, + double t, + double delta_t, + VectorType &y) = 0; /** * Empty structure used to store information. @@ -147,11 +147,11 @@ namespace TimeStepping * methods, @p F and @ J_inverse can only contain one element. */ double evolve_one_time_step - (std::vector > &F, - std::vector > &J_inverse, - double t, - double delta_t, - VectorType &y); + (std::vector > &F, + std::vector > &J_inverse, + double t, + double delta_t, + VectorType &y); /** * Purely virtual function. This function is used to advance from time @p @@ -165,11 +165,11 @@ namespace TimeStepping * evolve_one_time_step returns the time at the end of the time step. */ virtual double evolve_one_time_step - (std_cxx11::function f, - std_cxx11::function id_minus_tau_J_inverse, - double t, - double delta_t, - VectorType &y) = 0; + (std::function f, + std::function id_minus_tau_J_inverse, + double t, + double delta_t, + VectorType &y) = 0; protected: /** @@ -234,11 +234,11 @@ namespace TimeStepping * end of the time step. */ double evolve_one_time_step - (std_cxx11::function f, - std_cxx11::function id_minus_tau_J_inverse, - double t, - double delta_t, - VectorType &y); + (std::function f, + std::function id_minus_tau_J_inverse, + double t, + double delta_t, + VectorType &y); /** * This function is used to advance from time @p t to t+ @p delta_t. This @@ -248,10 +248,10 @@ namespace TimeStepping * step. */ double evolve_one_time_step - (std_cxx11::function f, - double t, - double delta_t, - VectorType &y); + (std::function f, + double t, + double delta_t, + VectorType &y); /** * This structure stores the name of the method used. @@ -276,11 +276,11 @@ namespace TimeStepping * Compute the different stages needed. */ void compute_stages - (std_cxx11::function f, - const double t, - const double delta_t, - const VectorType &y, - std::vector &f_stages) const; + (std::function f, + const double t, + const double delta_t, + const VectorType &y, + std::vector &f_stages) const; /** * Status structure of the object. @@ -333,11 +333,11 @@ namespace TimeStepping * returns the time at the end of the time step. */ double evolve_one_time_step - (std_cxx11::function f, - std_cxx11::function id_minus_tau_J_inverse, - double t, - double delta_t, - VectorType &y); + (std::function f, + std::function id_minus_tau_J_inverse, + double t, + double delta_t, + VectorType &y); /** * Set the maximum number of iterations and the tolerance used by the @@ -374,30 +374,30 @@ namespace TimeStepping * Compute the different stages needed. */ void compute_stages - (std_cxx11::function f, - std_cxx11::function id_minus_tau_J_inverse, - double t, - double delta_t, - VectorType &y, + (std::function f, + std::function id_minus_tau_J_inverse, + double t, + double delta_t, + VectorType &y, std::vector &f_stages); /** * Newton solver used for the implicit stages. */ - void newton_solve(std_cxx11::function get_residual, - std_cxx11::function id_minus_tau_J_inverse, - VectorType &y); + void newton_solve(std::function get_residual, + std::function id_minus_tau_J_inverse, + VectorType &y); /** * Compute the residual needed by the Newton solver. */ - void compute_residual(std_cxx11::function f, - double t, - double delta_t, - const VectorType &old_y, - const VectorType &y, - VectorType &tendency, - VectorType &residual) const; + void compute_residual(std::function f, + double t, + double delta_t, + const VectorType &new_y, + const VectorType &y, + VectorType &tendency, + VectorType &residual) const; /** * When using SDIRK, there is no need to compute the linear combination of @@ -483,10 +483,10 @@ namespace TimeStepping * at the end of the time step. */ double evolve_one_time_step - (std_cxx11::function f, - std_cxx11::function id_minus_tau_J_inverse, - double t, - double delta_t, + (std::function f, + std::function id_minus_tau_J_inverse, + double t, + double delta_t, VectorType &y); /** @@ -497,9 +497,9 @@ namespace TimeStepping * step. */ double evolve_one_time_step - (std_cxx11::function f, - double t, - double delta_t, + (std::function f, + double t, + double delta_t, VectorType &y); /** @@ -536,11 +536,11 @@ namespace TimeStepping /** * Compute the different stages needed. */ - void compute_stages(std_cxx11::function f, - const double t, - const double delta_t, - const VectorType &y, - std::vector &f_stages); + void compute_stages(std::function f, + const double t, + const double delta_t, + const VectorType &y, + std::vector &f_stages); /** * This parameter is the factor (>1) by which the time step is multiplied diff --git a/include/deal.II/base/time_stepping.templates.h b/include/deal.II/base/time_stepping.templates.h index 3300eb34cf..c105d7c56e 100644 --- a/include/deal.II/base/time_stepping.templates.h +++ b/include/deal.II/base/time_stepping.templates.h @@ -16,10 +16,11 @@ #ifndef dealii__time_stepping_templates_h #define dealii__time_stepping_templates_h -#include #include #include +#include + DEAL_II_NAMESPACE_OPEN namespace TimeStepping @@ -30,8 +31,8 @@ namespace TimeStepping template double RungeKutta::evolve_one_time_step( - std::vector > &F, - std::vector > &J_inverse, + std::vector > &F, + std::vector > &J_inverse, double t, double delta_t, @@ -137,8 +138,8 @@ namespace TimeStepping template double ExplicitRungeKutta::evolve_one_time_step - (std_cxx11::function f, - std_cxx11::function /*id_minus_tau_J_inverse*/, + (std::function f, + std::function /*id_minus_tau_J_inverse*/, double t, double delta_t, VectorType &y) @@ -150,7 +151,7 @@ namespace TimeStepping template double ExplicitRungeKutta::evolve_one_time_step - (std_cxx11::function f, + (std::function f, double t, double delta_t, VectorType &y) @@ -178,7 +179,7 @@ namespace TimeStepping template void ExplicitRungeKutta::compute_stages - (std_cxx11::function f, + (std::function f, const double t, const double delta_t, const VectorType &y, @@ -280,8 +281,8 @@ namespace TimeStepping template double ImplicitRungeKutta::evolve_one_time_step - (std_cxx11::function f, - std_cxx11::function id_minus_tau_J_inverse, + (std::function f, + std::function id_minus_tau_J_inverse, double t, double delta_t, VectorType &y) @@ -323,8 +324,8 @@ namespace TimeStepping template void ImplicitRungeKutta::compute_stages( - std_cxx11::function f, - std_cxx11::function id_minus_tau_J_inverse, + std::function f, + std::function id_minus_tau_J_inverse, double t, double delta_t, VectorType &y, @@ -340,9 +341,9 @@ namespace TimeStepping // Solve the nonlinear system using Newton's method const double new_t = t+this->c[i]*delta_t; const double new_delta_t = this->a[i][i]*delta_t; - newton_solve(std_cxx11::bind(&ImplicitRungeKutta::compute_residual,this,f,new_t,new_delta_t, - std_cxx11::cref(old_y),std_cxx11::_1,std_cxx11::ref(f_stages[i]),std_cxx11::_2), - std_cxx11::bind(id_minus_tau_J_inverse,new_t,new_delta_t,std_cxx11::_1),y); + newton_solve(std::bind(&ImplicitRungeKutta::compute_residual,this,f,new_t,new_delta_t, + std::cref(old_y),std::placeholders::_1,std::ref(f_stages[i]),std::placeholders::_2), + std::bind(id_minus_tau_J_inverse,new_t,new_delta_t,std::placeholders::_1),y); } } @@ -350,8 +351,8 @@ namespace TimeStepping template void ImplicitRungeKutta::newton_solve( - std_cxx11::function get_residual, - std_cxx11::function id_minus_tau_J_inverse, + std::function get_residual, + std::function id_minus_tau_J_inverse, VectorType &y) { VectorType residual(y); @@ -376,7 +377,7 @@ namespace TimeStepping template void ImplicitRungeKutta::compute_residual - (std_cxx11::function f, + (std::function f, double t, double delta_t, const VectorType &old_y, @@ -674,8 +675,8 @@ namespace TimeStepping template double EmbeddedExplicitRungeKutta::evolve_one_time_step( - std_cxx11::function f, - std_cxx11::function /*id_minus_tau_J_inverse*/, + std::function f, + std::function /*id_minus_tau_J_inverse*/, double t, double delta_t, VectorType &y) @@ -687,7 +688,7 @@ namespace TimeStepping template double EmbeddedExplicitRungeKutta::evolve_one_time_step( - std_cxx11::function f, + std::function f, double t, double delta_t, VectorType &y) { bool done = false; @@ -803,7 +804,7 @@ namespace TimeStepping template void EmbeddedExplicitRungeKutta::compute_stages( - std_cxx11::function f, + std::function f, const double t, const double delta_t, const VectorType &y, diff --git a/include/deal.II/base/work_stream.h b/include/deal.II/base/work_stream.h index 0ae78687d6..b15ed09266 100644 --- a/include/deal.II/base/work_stream.h +++ b/include/deal.II/base/work_stream.h @@ -22,8 +22,6 @@ #include #include #include -#include -#include #include #include @@ -35,7 +33,7 @@ #include #include #include - +#include DEAL_II_NAMESPACE_OPEN @@ -152,7 +150,7 @@ namespace WorkStream namespace internal { -//TODO: The following classes all use std_cxx11::shared_ptr, but the +//TODO: The following classes all use std::shared_ptr, but the // correct pointer class would actually be std::unique_ptr. make this // replacement whenever we have a class that provides these semantics // and that is available also as a fall-back whenever via boost or similar @@ -195,8 +193,8 @@ namespace WorkStream */ struct ScratchDataObject { - std_cxx11::shared_ptr scratch_data; - bool currently_in_use; + std::shared_ptr scratch_data; + bool currently_in_use; /** * Default constructor. @@ -481,9 +479,9 @@ namespace WorkStream * operate as well as a pointer to the function that will do the * assembly. */ - Worker (const std_cxx11::function &worker, + Worker (const std::function &worker, bool copier_exist=true) : tbb::filter (/* is_serial= */ false), @@ -599,9 +597,9 @@ namespace WorkStream * Pointer to the function that does the assembling on the sequence of * cells. */ - const std_cxx11::function worker; + const std::function worker; /** * This flag is true if the copier stage exist. If it does not, the @@ -629,7 +627,7 @@ namespace WorkStream * copying from the additional data object to the global matrix or * similar. */ - Copier (const std_cxx11::function &copier) + Copier (const std::function &copier) : tbb::filter (/*is_serial=*/true), copier (copier) @@ -682,7 +680,7 @@ namespace WorkStream /** * Pointer to the function that does the copying of data. */ - const std_cxx11::function copier; + const std::function copier; }; } @@ -707,9 +705,9 @@ namespace WorkStream typename CopyData> struct ScratchAndCopyDataObjects { - std_cxx11::shared_ptr scratch_data; - std_cxx11::shared_ptr copy_data; - bool currently_in_use; + std::shared_ptr scratch_data; + std::shared_ptr copy_data; + bool currently_in_use; /** * Default constructor. @@ -762,10 +760,10 @@ namespace WorkStream /** * Constructor. */ - WorkerAndCopier (const std_cxx11::function &worker, - const std_cxx11::function &copier, + WorkerAndCopier (const std::function &worker, + const std::function &copier, const ScratchData &sample_scratch_data, const CopyData &sample_copy_data) : @@ -882,15 +880,15 @@ namespace WorkStream * Pointer to the function that does the assembling on the sequence of * cells. */ - const std_cxx11::function worker; + const std::function worker; /** * Pointer to the function that does the copying from local * contribution to global object. */ - const std_cxx11::function copier; + const std::function copier; /** * References to sample scratch and copy data for when we need them. @@ -1031,11 +1029,11 @@ namespace WorkStream { // need to check if the function is not the zero function. To // check zero-ness, create a C++ function out of it and check that - if (static_cast& >(worker)) + if (static_cast& >(worker)) worker (i, scratch_data, copy_data); - if (static_cast& > + if (static_cast& > (copier)) copier (copy_data); } @@ -1044,7 +1042,7 @@ namespace WorkStream else // have TBB and use more than one thread { // Check that the copier exist - if (static_cast& >(copier)) + if (static_cast& >(copier)) { // create the three stages of the pipeline internal::Implementation2::IteratorRangeToItemStream @@ -1139,11 +1137,11 @@ namespace WorkStream { // need to check if the function is not the zero function. To // check zero-ness, create a C++ function out of it and check that - if (static_cast& >(worker)) + if (static_cast& >(worker)) worker (*p, scratch_data, copy_data); - if (static_cast& >(copier)) + if (static_cast& >(copier)) copier (copy_data); } } @@ -1171,9 +1169,9 @@ namespace WorkStream (colored_iterators[color].begin(), colored_iterators[color].end(), /*grain_size=*/chunk_size), - std_cxx11::bind (&WorkerAndCopier::operator(), - std_cxx11::ref(worker_and_copier), - std_cxx11::_1), + std::bind (&WorkerAndCopier::operator(), + std::ref(worker_and_copier), + std::placeholders::_1), tbb::auto_partitioner()); } } @@ -1232,12 +1230,12 @@ namespace WorkStream { // forward to the other function run (begin, end, - std_cxx11::bind (worker, - std_cxx11::ref (main_object), - std_cxx11::_1, std_cxx11::_2, std_cxx11::_3), - std_cxx11::bind (copier, - std_cxx11::ref (main_object), - std_cxx11::_1), + std::bind (worker, + std::ref (main_object), + std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), + std::bind (copier, + std::ref (main_object), + std::placeholders::_1), sample_scratch_data, sample_copy_data, queue_length, diff --git a/include/deal.II/distributed/shared_tria.h b/include/deal.II/distributed/shared_tria.h index 22f671bc75..c554423b13 100644 --- a/include/deal.II/distributed/shared_tria.h +++ b/include/deal.II/distributed/shared_tria.h @@ -26,9 +26,9 @@ #include -#include -#include +#include +#include #include #include #include diff --git a/include/deal.II/distributed/tria.h b/include/deal.II/distributed/tria.h index 31b2c43661..886a65ce47 100644 --- a/include/deal.II/distributed/tria.h +++ b/include/deal.II/distributed/tria.h @@ -23,9 +23,6 @@ #include #include -#include -#include - #include #include @@ -33,6 +30,8 @@ #include #include #include +#include +#include #ifdef DEAL_II_WITH_MPI # include @@ -157,7 +156,7 @@ namespace parallel * information into the function. C++ provides a nice mechanism for this * that is best explained using an example: * @code - * #include + * #include * * template * void set_boundary_ids (parallel::distributed::Triangulation &triangulation) @@ -173,13 +172,13 @@ namespace parallel * ... create the coarse mesh ... * * coarse_grid.signals.post_refinement.connect - * (std_cxx11::bind (&set_boundary_ids, - * std_cxx11::ref(coarse_grid))); + * (std::bind (&set_boundary_ids, + * std::ref(coarse_grid))); * * } * @endcode * - * What the call to std_cxx11::bind does is to produce an + * What the call to std::bind does is to produce an * object that can be called like a function with no arguments. It does so * by taking the address of a function that does, in fact, take an * argument but permanently fix this one argument to a reference to the @@ -197,7 +196,7 @@ namespace parallel * static, but possibly private) member function of the * MyClass class, then the following will work: * @code - * #include + * #include * * template * void @@ -215,9 +214,9 @@ namespace parallel * ... create the coarse mesh ... * * coarse_grid.signals.post_refinement.connect - * (std_cxx11::bind (&MyGeometry::set_boundary_ids, - * std_cxx11::cref(*this), - * std_cxx11::ref(coarse_grid))); + * (std::bind (&MyGeometry::set_boundary_ids, + * std::cref(*this), + * std::ref(coarse_grid))); * } * @endcode * Here, like any other member function, set_boundary_ids @@ -644,9 +643,9 @@ namespace parallel */ unsigned int register_data_attach (const std::size_t size, - const std_cxx11::function &pack_callback); + const std::function &pack_callback); /** * The supplied callback function is called for each newly locally owned @@ -664,9 +663,9 @@ namespace parallel */ void notify_ready_to_unpack (const unsigned int offset, - const std_cxx11::function &unpack_callback); + const std::function &unpack_callback); /** * Return a permutation vector for the order the coarse cells are handed @@ -776,7 +775,7 @@ namespace parallel */ unsigned int n_attached_deserialize; - typedef std_cxx11::function< + typedef std::function< void(typename Triangulation::cell_iterator, CellStatus, void *) > pack_callback_t; diff --git a/include/deal.II/distributed/tria_base.h b/include/deal.II/distributed/tria_base.h index 047cce0a98..d693dbbaaa 100644 --- a/include/deal.II/distributed/tria_base.h +++ b/include/deal.II/distributed/tria_base.h @@ -24,9 +24,8 @@ #include #include -#include -#include - +#include +#include #include #include #include diff --git a/include/deal.II/dofs/dof_handler.h b/include/deal.II/dofs/dof_handler.h index cb251e96e4..97df4ef314 100644 --- a/include/deal.II/dofs/dof_handler.h +++ b/include/deal.II/dofs/dof_handler.h @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -36,6 +35,7 @@ #include #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -940,7 +940,7 @@ private: * An object that describes how degrees of freedom should be distributed and * renumbered. */ - std_cxx11::shared_ptr > policy; + std::shared_ptr > policy; /** * A structure that contains all sorts of numbers that characterize the diff --git a/include/deal.II/fe/fe_p1nc.h b/include/deal.II/fe/fe_p1nc.h index b6fa0008c2..85b46eaf7c 100644 --- a/include/deal.II/fe/fe_p1nc.h +++ b/include/deal.II/fe/fe_p1nc.h @@ -285,7 +285,7 @@ private: * Return the coefficients of 4 local linear shape functions $\phi_j(x,y) = a x + b y + c$ on given cell. * For each local shape function, the array consists of three coefficients is in order of a,b and c. */ - static std_cxx11::array,4> + static std::array,4> get_linear_shape_coefficients (const Triangulation<2,2>::cell_iterator &cell); /** diff --git a/include/deal.II/fe/fe_series.h b/include/deal.II/fe/fe_series.h index 88102f5239..fd98182934 100644 --- a/include/deal.II/fe/fe_series.h +++ b/include/deal.II/fe/fe_series.h @@ -18,7 +18,6 @@ -#include #include #include #include @@ -33,6 +32,7 @@ #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -260,7 +260,7 @@ namespace FESeries template std::pair,std::vector > process_coefficients(const Table &coefficients, - const std_cxx11::function(const TableIndices &)> &predicate, + const std::function(const TableIndices &)> &predicate, const VectorTools::NormType norm); @@ -286,7 +286,7 @@ namespace template void fill_map_index(const Table &coefficients, const TableIndices &ind, - const std_cxx11::function(const TableIndices &)> &predicate, + const std::function(const TableIndices &)> &predicate, std::map > &pred_to_values) { const std::pair pred_pair = predicate(ind); @@ -303,7 +303,7 @@ namespace template void fill_map(const Table<1,T> &coefficients, - const std_cxx11::function(const TableIndices<1> &)> &predicate, + const std::function(const TableIndices<1> &)> &predicate, std::map > &pred_to_values) { for (unsigned int i = 0; i < coefficients.size(0); i++) @@ -316,7 +316,7 @@ namespace template void fill_map(const Table<2,T> &coefficients, - const std_cxx11::function(const TableIndices<2> &)> &predicate, + const std::function(const TableIndices<2> &)> &predicate, std::map > &pred_to_values) { for (unsigned int i = 0; i < coefficients.size(0); i++) @@ -330,7 +330,7 @@ namespace template void fill_map(const Table<3,T> &coefficients, - const std_cxx11::function(const TableIndices<3> &)> &predicate, + const std::function(const TableIndices<3> &)> &predicate, std::map > &pred_to_values) { for (unsigned int i = 0; i < coefficients.size(0); i++) @@ -363,7 +363,7 @@ namespace template std::pair,std::vector > FESeries::process_coefficients(const Table &coefficients, - const std_cxx11::function(const TableIndices &)> &predicate, + const std::function(const TableIndices &)> &predicate, const VectorTools::NormType norm) { std::vector predicate_values; diff --git a/include/deal.II/fe/fe_system.h b/include/deal.II/fe/fe_system.h index 2b8f9b515f..f6cee693c7 100644 --- a/include/deal.II/fe/fe_system.h +++ b/include/deal.II/fe/fe_system.h @@ -957,7 +957,7 @@ private: * pointers to the underlying base finite elements. The last one of these * copies around will then delete the pointer to the base elements. */ - std::vector >, + std::vector >, unsigned int> > base_elements; diff --git a/include/deal.II/fe/fe_values.h b/include/deal.II/fe/fe_values.h index e34675f2f1..7e52a0ea39 100644 --- a/include/deal.II/fe/fe_values.h +++ b/include/deal.II/fe/fe_values.h @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -38,6 +37,7 @@ #include #include +#include // dummy include in order to have the // definition of PetscScalar available @@ -2624,7 +2624,7 @@ protected: * is necessary for the get_function_* functions as well as the * functions of same name in the extractor classes. */ - std_cxx11::unique_ptr present_cell; + std::unique_ptr present_cell; /** * A signal connection we use to ensure we get informed whenever the @@ -2673,7 +2673,7 @@ protected: * Mapping::get_data(), Mapping::get_face_data(), or * Mapping::get_subface_data(). */ - std_cxx11::unique_ptr::InternalDataBase> mapping_data; + std::unique_ptr::InternalDataBase> mapping_data; /** * An object into which the Mapping::fill_fe_values() and similar functions @@ -2693,7 +2693,7 @@ protected: * FiniteElement::get_data(), Mapping::get_face_data(), or * FiniteElement::get_subface_data(). */ - std_cxx11::unique_ptr::InternalDataBase> fe_data; + std::unique_ptr::InternalDataBase> fe_data; /** * An object into which the FiniteElement::fill_fe_values() and similar diff --git a/include/deal.II/fe/mapping.h b/include/deal.II/fe/mapping.h index bb350092c9..5f8c882e9f 100644 --- a/include/deal.II/fe/mapping.h +++ b/include/deal.II/fe/mapping.h @@ -19,11 +19,11 @@ #include #include -#include #include #include #include +#include #include DEAL_II_NAMESPACE_OPEN @@ -320,7 +320,7 @@ public: * cell-@>vertex(v). */ virtual - std_cxx11::array, GeometryInfo::vertices_per_cell> + std::array, GeometryInfo::vertices_per_cell> get_vertices (const typename Triangulation::cell_iterator &cell) const; /** diff --git a/include/deal.II/fe/mapping_fe_field.h b/include/deal.II/fe/mapping_fe_field.h index b0d94cb8a2..72133d0961 100644 --- a/include/deal.II/fe/mapping_fe_field.h +++ b/include/deal.II/fe/mapping_fe_field.h @@ -25,7 +25,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -372,7 +372,7 @@ public: * * Filled once. */ - std_cxx11::array >, GeometryInfo::faces_per_cell *(dim-1)> unit_tangentials; + std::array >, GeometryInfo::faces_per_cell *(dim-1)> unit_tangentials; /** * Number of shape functions. If this is a Q1 mapping, then it is simply diff --git a/include/deal.II/fe/mapping_manifold.h b/include/deal.II/fe/mapping_manifold.h index b0c821b805..b75923ef36 100644 --- a/include/deal.II/fe/mapping_manifold.h +++ b/include/deal.II/fe/mapping_manifold.h @@ -291,7 +291,7 @@ public: * * Filled once. */ - std_cxx11::array >, GeometryInfo::faces_per_cell *(dim-1)> unit_tangentials; + std::array >, GeometryInfo::faces_per_cell *(dim-1)> unit_tangentials; /** * Tensors of covariant transformation at each of the quadrature points. diff --git a/include/deal.II/fe/mapping_q.h b/include/deal.II/fe/mapping_q.h index 298dc57716..d9435919ac 100644 --- a/include/deal.II/fe/mapping_q.h +++ b/include/deal.II/fe/mapping_q.h @@ -257,13 +257,13 @@ protected: * A pointer to a structure to store the information for the pure $Q_1$ * mapping that is, by default, used on all interior cells. */ - std_cxx11::unique_ptr::InternalData> mapping_q1_data; + std::unique_ptr::InternalData> mapping_q1_data; /** * A pointer to a structure to store the information for the full $Q_p$ * mapping that is, by default, used on all boundary cells. */ - std_cxx11::unique_ptr::InternalData> mapping_qp_data; + std::unique_ptr::InternalData> mapping_qp_data; }; protected: @@ -352,7 +352,7 @@ protected: * the qp_mapping and q1_mapping variables point to the same underlying * object. */ - std_cxx11::shared_ptr > q1_mapping; + std::shared_ptr > q1_mapping; /** * Pointer to a Q_p mapping. This mapping is used on boundary cells unless @@ -368,7 +368,7 @@ protected: * the qp_mapping and q1_mapping variables point to the same underlying * object. */ - std_cxx11::shared_ptr > qp_mapping; + std::shared_ptr > qp_mapping; }; /*@}*/ diff --git a/include/deal.II/fe/mapping_q1_eulerian.h b/include/deal.II/fe/mapping_q1_eulerian.h index 9809a40c9c..d7b7483483 100644 --- a/include/deal.II/fe/mapping_q1_eulerian.h +++ b/include/deal.II/fe/mapping_q1_eulerian.h @@ -17,11 +17,13 @@ #define dealii__mapping_q1_eulerian_h #include -#include #include #include #include + +#include + DEAL_II_NAMESPACE_OPEN template class Vector; @@ -120,7 +122,7 @@ public: * addition to the geometry of the cell. */ virtual - std_cxx11::array, GeometryInfo::vertices_per_cell> + std::array, GeometryInfo::vertices_per_cell> get_vertices (const typename Triangulation::cell_iterator &cell) const; /** diff --git a/include/deal.II/fe/mapping_q_eulerian.h b/include/deal.II/fe/mapping_q_eulerian.h index c7de1fd904..b70640ff8e 100644 --- a/include/deal.II/fe/mapping_q_eulerian.h +++ b/include/deal.II/fe/mapping_q_eulerian.h @@ -122,7 +122,7 @@ public: * addition to the geometry of the cell. */ virtual - std_cxx11::array, GeometryInfo::vertices_per_cell> + std::array, GeometryInfo::vertices_per_cell> get_vertices (const typename Triangulation::cell_iterator &cell) const; /** @@ -196,7 +196,7 @@ private: * field in addition to the geometry of the cell. */ virtual - std_cxx11::array, GeometryInfo::vertices_per_cell> + std::array, GeometryInfo::vertices_per_cell> get_vertices (const typename Triangulation::cell_iterator &cell) const; /** diff --git a/include/deal.II/fe/mapping_q_generic.h b/include/deal.II/fe/mapping_q_generic.h index c765e10c27..99e101e8d7 100644 --- a/include/deal.II/fe/mapping_q_generic.h +++ b/include/deal.II/fe/mapping_q_generic.h @@ -25,8 +25,7 @@ #include #include -#include - +#include #include DEAL_II_NAMESPACE_OPEN @@ -420,7 +419,7 @@ public: * * Filled once. */ - std_cxx11::array >, GeometryInfo::faces_per_cell *(dim-1)> unit_tangentials; + std::array >, GeometryInfo::faces_per_cell *(dim-1)> unit_tangentials; /** * The polynomial degree of the mapping. Since the objects here are also @@ -570,7 +569,7 @@ protected: * shape functions/DoFs on non-standard faces. This is used to reorder * support points in the same way. */ - const std_cxx11::unique_ptr > fe_q; + const std::unique_ptr > fe_q; /** * A vector of tables of weights by which we multiply the locations of the diff --git a/include/deal.II/grid/cell_id.h b/include/deal.II/grid/cell_id.h index 4c818fa45e..5dc08a02c7 100644 --- a/include/deal.II/grid/cell_id.h +++ b/include/deal.II/grid/cell_id.h @@ -18,8 +18,8 @@ #include #include -#include +#include #include #include @@ -63,7 +63,7 @@ public: * (using 2 times 32 bit for storage), a limitation that is identical to * the one used by p4est. */ - typedef std_cxx11::array binary_type; + typedef std::array binary_type; /** * Construct a CellId object with a given @p coarse_cell_id and vector of @@ -160,9 +160,9 @@ private: * the array can be extended. */ #ifdef DEAL_II_WITH_P4EST - std_cxx11::array::max_level> child_indices; + std::array::max_level> child_indices; #else - std_cxx11::array child_indices; + std::array child_indices; #endif friend std::istream &operator>> (std::istream &is, CellId &cid); diff --git a/include/deal.II/grid/filtered_iterator.h b/include/deal.II/grid/filtered_iterator.h index e0ec77c7cd..c8627acf4b 100644 --- a/include/deal.II/grid/filtered_iterator.h +++ b/include/deal.II/grid/filtered_iterator.h @@ -376,7 +376,7 @@ namespace IteratorFilters * @endcode * then * @code - * std_cxx11::bind (&level_equal_to, std_cxx11::_1, 3) + * std::bind (&level_equal_to, std::placeholders::_1, 3) * @endcode * is another valid predicate (here: a function that returns true if either * the iterator is past the end or the level is equal to the second argument; diff --git a/include/deal.II/grid/grid_generator.h b/include/deal.II/grid/grid_generator.h index f3f33995f1..d2fa439c4a 100644 --- a/include/deal.II/grid/grid_generator.h +++ b/include/deal.II/grid/grid_generator.h @@ -18,12 +18,13 @@ #include -#include #include #include #include #include #include + +#include #include DEAL_II_NAMESPACE_OPEN @@ -409,7 +410,7 @@ namespace GridGenerator void subdivided_parallelepiped (Triangulation &tria, const Point &origin, - const std_cxx11::array,dim> &edges, + const std::array,dim> &edges, const std::vector &subdivisions = std::vector(), const bool colorize = false); diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h index 5f9a1005cb..9e1e558abc 100644 --- a/include/deal.II/grid/grid_tools.h +++ b/include/deal.II/grid/grid_tools.h @@ -735,7 +735,7 @@ namespace GridTools std::vector compute_active_cell_halo_layer (const MeshType &mesh, - const std_cxx11::function &predicate); + const std::function &predicate); /** * Extract and return ghost cells which are the active cell layer around all diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h index 74ef9ca223..c4d120196f 100644 --- a/include/deal.II/grid/tria.h +++ b/include/deal.II/grid/tria.h @@ -23,8 +23,6 @@ #include #include #include -#include -#include #include // Ignore deprecation warnings for auto_ptr. @@ -45,6 +43,8 @@ DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include #include +#include +#include DEAL_II_NAMESPACE_OPEN @@ -1067,8 +1067,8 @@ namespace internal * // mesh refinement * previous_cell = current_cell; * previous_cell->get_triangulation().signals.post_refinement - * .connect (std_cxx11::bind (&FEValues::invalidate_previous_cell, - * std_cxx11::ref (*this))); + * .connect (std::bind (&FEValues::invalidate_previous_cell, + * std::ref (*this))); * } * else * previous_cell = current_cell; @@ -3438,7 +3438,7 @@ private: * in 2D it contains data concerning lines and in 3D quads and lines. All * of these have no level and are therefore treated separately. */ - std_cxx11::unique_ptr > faces; + std::unique_ptr > faces; /** @@ -3495,7 +3495,7 @@ private: * this field (that can be modified by TriaAccessor::set_boundary_id) were * not a pointer. */ - std_cxx11::unique_ptr > vertex_to_boundary_id_map_1d; + std::unique_ptr > vertex_to_boundary_id_map_1d; /** @@ -3517,7 +3517,7 @@ private: * this field (that can be modified by TriaAccessor::set_boundary_id) were * not a pointer. */ - std_cxx11::unique_ptr > vertex_to_manifold_id_map_1d; + std::unique_ptr > vertex_to_manifold_id_map_1d; // make a couple of classes friends template friend class TriaAccessorBase; diff --git a/include/deal.II/grid/tria_boundary.h b/include/deal.II/grid/tria_boundary.h index db181d6748..5e1d85b4ab 100644 --- a/include/deal.II/grid/tria_boundary.h +++ b/include/deal.II/grid/tria_boundary.h @@ -210,7 +210,7 @@ private: /** * Point generator for the intermediate points on a boundary. */ - mutable std::vector > > points; + mutable std::vector > > points; /** * Mutex for protecting the points array. diff --git a/include/deal.II/hp/fe_collection.h b/include/deal.II/hp/fe_collection.h index 0e4ec67e63..4f061c4680 100644 --- a/include/deal.II/hp/fe_collection.h +++ b/include/deal.II/hp/fe_collection.h @@ -17,11 +17,12 @@ #define dealii__fe_collection_h #include -#include #include #include #include +#include + DEAL_II_NAMESPACE_OPEN namespace hp @@ -458,7 +459,7 @@ namespace hp /** * Array of pointers to the finite elements stored by this collection. */ - std::vector > > finite_elements; + std::vector > > finite_elements; }; diff --git a/include/deal.II/hp/fe_values.h b/include/deal.II/hp/fe_values.h index abe54dc653..c3a08b15cc 100644 --- a/include/deal.II/hp/fe_values.h +++ b/include/deal.II/hp/fe_values.h @@ -24,7 +24,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -153,7 +153,7 @@ namespace internal * Initially, all entries have zero pointers, and we will allocate them * lazily as needed in select_fe_values(). */ - dealii::Table<3,std_cxx11::shared_ptr > fe_values_table; + dealii::Table<3,std::shared_ptr > fe_values_table; /** * Set of indices pointing at the fe_values object selected last time diff --git a/include/deal.II/hp/mapping_collection.h b/include/deal.II/hp/mapping_collection.h index b5405832e1..2ae9786947 100644 --- a/include/deal.II/hp/mapping_collection.h +++ b/include/deal.II/hp/mapping_collection.h @@ -22,7 +22,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -113,7 +113,7 @@ namespace hp * The real container, which stores pointers to the different Mapping * objects. */ - std::vector > > mappings; + std::vector > > mappings; }; diff --git a/include/deal.II/hp/q_collection.h b/include/deal.II/hp/q_collection.h index 06a5caa3de..ebdd02c2f2 100644 --- a/include/deal.II/hp/q_collection.h +++ b/include/deal.II/hp/q_collection.h @@ -23,7 +23,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -129,7 +129,7 @@ namespace hp * The real container, which stores pointers to the different quadrature * objects. */ - std::vector > > quadratures; + std::vector > > quadratures; }; @@ -188,7 +188,7 @@ namespace hp QCollection::QCollection (const Quadrature &quadrature) { quadratures - .push_back (std_cxx11::shared_ptr >(new Quadrature(quadrature))); + .push_back (std::shared_ptr >(new Quadrature(quadrature))); } @@ -231,7 +231,7 @@ namespace hp QCollection::push_back (const Quadrature &new_quadrature) { quadratures - .push_back (std_cxx11::shared_ptr >(new Quadrature(new_quadrature))); + .push_back (std::shared_ptr >(new Quadrature(new_quadrature))); } } // namespace hp diff --git a/include/deal.II/lac/block_vector.h b/include/deal.II/lac/block_vector.h index 0ff832ee80..2d04587fcf 100644 --- a/include/deal.II/lac/block_vector.h +++ b/include/deal.II/lac/block_vector.h @@ -525,7 +525,7 @@ namespace internal * @author Uwe Koecher, 2017 */ template -struct is_serial_vector< BlockVector< Number > > : std_cxx11::true_type +struct is_serial_vector< BlockVector< Number > > : std::true_type { }; diff --git a/include/deal.II/lac/chunk_sparse_matrix.templates.h b/include/deal.II/lac/chunk_sparse_matrix.templates.h index 241c495c5a..6e26eb9271 100644 --- a/include/deal.II/lac/chunk_sparse_matrix.templates.h +++ b/include/deal.II/lac/chunk_sparse_matrix.templates.h @@ -408,10 +408,10 @@ ChunkSparseMatrix::operator = (const double d) (matrix_size+m()) / m(); if (matrix_size>grain_size) parallel::apply_to_subranges (0U, matrix_size, - std_cxx11::bind(&internal::ChunkSparseMatrix::template - zero_subrange, - std_cxx11::_1, std_cxx11::_2, - val), + std::bind(&internal::ChunkSparseMatrix::template + zero_subrange, + std::placeholders::_1, std::placeholders::_2, + val), grain_size); else if (matrix_size > 0) std::memset (&val[0], 0, matrix_size*sizeof(number)); @@ -523,7 +523,7 @@ ChunkSparseMatrix::n_actually_nonzero_elements () const return std::count_if(&val[0], &val[cols->sparsity_pattern.n_nonzero_elements () * chunk_size * chunk_size], - std_cxx11::bind(std::not_equal_to(), std_cxx11::_1, 0)); + std::bind(std::not_equal_to(), std::placeholders::_1, 0)); } @@ -717,15 +717,15 @@ ChunkSparseMatrix::vmult_add (OutVector &dst, Assert (!PointerComparison::equal(&src, &dst), ExcSourceEqualsDestination()); parallel::apply_to_subranges (0U, cols->sparsity_pattern.n_rows(), - std_cxx11::bind (&internal::ChunkSparseMatrix::vmult_add_on_subrange - , - std_cxx11::cref(*cols), - std_cxx11::_1, std_cxx11::_2, - val, - cols->sparsity_pattern.rowstart, - cols->sparsity_pattern.colnums, - std_cxx11::cref(src), - std_cxx11::ref(dst)), + std::bind (&internal::ChunkSparseMatrix::vmult_add_on_subrange + , + std::cref(*cols), + std::placeholders::_1, std::placeholders::_2, + val, + cols->sparsity_pattern.rowstart, + cols->sparsity_pattern.colnums, + std::cref(src), + std::ref(dst)), internal::SparseMatrix::minimum_parallel_grain_size/cols->chunk_size+1); } diff --git a/include/deal.II/lac/cuda_vector.h b/include/deal.II/lac/cuda_vector.h index c91751d486..17b57dc28d 100644 --- a/include/deal.II/lac/cuda_vector.h +++ b/include/deal.II/lac/cuda_vector.h @@ -93,8 +93,8 @@ namespace LinearAlgebra */ virtual void import(const ReadWriteVector &V, VectorOperation::values operation, - std_cxx11::shared_ptr communication_pattern = - std_cxx11::shared_ptr ()) override; + std::shared_ptr communication_pattern = + std::shared_ptr ()) override; /** * Multiply the entive vector by a fixed factor. diff --git a/include/deal.II/lac/filtered_matrix.h b/include/deal.II/lac/filtered_matrix.h index 534ae54453..a6b28604c2 100644 --- a/include/deal.II/lac/filtered_matrix.h +++ b/include/deal.II/lac/filtered_matrix.h @@ -512,7 +512,7 @@ private: /** * Pointer to the sparsity pattern used for this matrix. */ - std_cxx11::shared_ptr > matrix; + std::shared_ptr > matrix; /** * Sorted list of pairs denoting the index of the variable and the value to diff --git a/include/deal.II/lac/iterative_inverse.h b/include/deal.II/lac/iterative_inverse.h index 59f3da512f..d9ab0537a1 100644 --- a/include/deal.II/lac/iterative_inverse.h +++ b/include/deal.II/lac/iterative_inverse.h @@ -114,12 +114,12 @@ private: /** * The matrix in use. */ - std_cxx11::shared_ptr > matrix; + std::shared_ptr > matrix; /** * The preconditioner to use. */ - std_cxx11::shared_ptr > preconditioner; + std::shared_ptr > preconditioner; }; @@ -130,8 +130,8 @@ void IterativeInverse::initialize(const MatrixType &m, const PreconditionerType &p) { VectorType v; - matrix = std_cxx11::shared_ptr > (new_pointer_matrix_base(m, v)); - preconditioner = std_cxx11::shared_ptr > (new_pointer_matrix_base(p, v)); + matrix = std::shared_ptr > (new_pointer_matrix_base(m, v)); + preconditioner = std::shared_ptr > (new_pointer_matrix_base(p, v)); } diff --git a/include/deal.II/lac/la_parallel_block_vector.h b/include/deal.II/lac/la_parallel_block_vector.h index 3e3e10d85d..7bc0135691 100644 --- a/include/deal.II/lac/la_parallel_block_vector.h +++ b/include/deal.II/lac/la_parallel_block_vector.h @@ -435,8 +435,8 @@ namespace LinearAlgebra */ virtual void import(const LinearAlgebra::ReadWriteVector &V, VectorOperation::values operation, - std_cxx11::shared_ptr communication_pattern = - std_cxx11::shared_ptr ()); + std::shared_ptr communication_pattern = + std::shared_ptr ()); /** * Return the scalar product of two vectors. @@ -605,7 +605,7 @@ void swap (LinearAlgebra::distributed::BlockVector &u, * @author Uwe Koecher, 2017 */ template -struct is_serial_vector< LinearAlgebra::distributed::BlockVector< Number > > : std_cxx11::false_type +struct is_serial_vector< LinearAlgebra::distributed::BlockVector< Number > > : std::false_type { }; diff --git a/include/deal.II/lac/la_parallel_block_vector.templates.h b/include/deal.II/lac/la_parallel_block_vector.templates.h index 3ce3fd73bd..645f387933 100644 --- a/include/deal.II/lac/la_parallel_block_vector.templates.h +++ b/include/deal.II/lac/la_parallel_block_vector.templates.h @@ -722,7 +722,7 @@ namespace LinearAlgebra void BlockVector::import(const LinearAlgebra::ReadWriteVector &, VectorOperation::values, - std_cxx11::shared_ptr) + std::shared_ptr) { AssertThrow(false, ExcNotImplemented()); } diff --git a/include/deal.II/lac/la_parallel_vector.h b/include/deal.II/lac/la_parallel_vector.h index 3eade6c159..f75a71332e 100644 --- a/include/deal.II/lac/la_parallel_vector.h +++ b/include/deal.II/lac/la_parallel_vector.h @@ -20,12 +20,12 @@ #include #include #include -#include #include #include #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -254,7 +254,7 @@ namespace LinearAlgebra * partitioner data only once and share it between several vectors with * the same layout. */ - Vector (const std_cxx11::shared_ptr &partitioner); + Vector (const std::shared_ptr &partitioner); /** * Destructor. @@ -314,7 +314,7 @@ namespace LinearAlgebra * the partitioner data only once and share it between several vectors * with the same layout. */ - void reinit (const std_cxx11::shared_ptr &partitioner); + void reinit (const std::shared_ptr &partitioner); /** * Swap the contents of this vector and the other vector @p v. One could @@ -564,8 +564,8 @@ namespace LinearAlgebra */ virtual void import(const LinearAlgebra::ReadWriteVector &V, VectorOperation::values operation, - std_cxx11::shared_ptr communication_pattern = - std_cxx11::shared_ptr ()); + std::shared_ptr communication_pattern = + std::shared_ptr ()); /** * Return the scalar product of two vectors. @@ -936,7 +936,7 @@ namespace LinearAlgebra * respective reinit() call, for additional queries regarding the * parallel communication, or the compatibility of partitioners. */ - const std_cxx11::shared_ptr & + const std::shared_ptr & get_partitioner () const; /** @@ -1049,7 +1049,7 @@ namespace LinearAlgebra * information can be shared between several vectors that have the same * partitioning. */ - std_cxx11::shared_ptr partitioner; + std::shared_ptr partitioner; /** * The size that is currently allocated in the val array. @@ -1065,7 +1065,7 @@ namespace LinearAlgebra * For parallel loops with TBB, this member variable stores the affinity * information of loops. */ - mutable std_cxx11::shared_ptr< ::dealii::parallel::internal::TBBPartitioner> thread_loop_partitioner; + mutable std::shared_ptr< ::dealii::parallel::internal::TBBPartitioner> thread_loop_partitioner; /** * Temporary storage that holds the data that is sent to this processor @@ -1441,7 +1441,7 @@ namespace LinearAlgebra template inline - const std_cxx11::shared_ptr & + const std::shared_ptr & Vector::get_partitioner () const { return partitioner; @@ -1476,7 +1476,7 @@ void swap (LinearAlgebra::distributed::Vector &u, * @author Uwe Koecher, 2017 */ template -struct is_serial_vector< LinearAlgebra::distributed::Vector< Number > > : std_cxx11::false_type +struct is_serial_vector< LinearAlgebra::distributed::Vector< Number > > : std::false_type { }; diff --git a/include/deal.II/lac/la_parallel_vector.templates.h b/include/deal.II/lac/la_parallel_vector.templates.h index f301534469..e096652690 100644 --- a/include/deal.II/lac/la_parallel_vector.templates.h +++ b/include/deal.II/lac/la_parallel_vector.templates.h @@ -159,7 +159,7 @@ namespace LinearAlgebra const MPI_Comm communicator) { // set up parallel partitioner with index sets and communicator - std_cxx11::shared_ptr new_partitioner + std::shared_ptr new_partitioner (new Utilities::MPI::Partitioner (locally_owned_indices, ghost_indices, communicator)); reinit (new_partitioner); @@ -173,7 +173,7 @@ namespace LinearAlgebra const MPI_Comm communicator) { // set up parallel partitioner with index sets and communicator - std_cxx11::shared_ptr new_partitioner + std::shared_ptr new_partitioner (new Utilities::MPI::Partitioner (locally_owned_indices, communicator)); reinit (new_partitioner); @@ -183,7 +183,7 @@ namespace LinearAlgebra template void - Vector::reinit (const std_cxx11::shared_ptr &partitioner_in) + Vector::reinit (const std::shared_ptr &partitioner_in) { clear_mpi_requests(); partitioner = partitioner_in; @@ -290,7 +290,7 @@ namespace LinearAlgebra template Vector:: - Vector (const std_cxx11::shared_ptr &partitioner) + Vector (const std::shared_ptr &partitioner) : allocated_size (0), val (0), @@ -825,12 +825,12 @@ namespace LinearAlgebra void Vector::import(const ReadWriteVector &V, VectorOperation::values operation, - std_cxx11::shared_ptr communication_pattern) + std::shared_ptr communication_pattern) { IndexSet locally_owned_elem = locally_owned_elements(); // If no communication pattern is given, create one. Otherwise, use the // given one. - std_cxx11::shared_ptr comm_pattern; + std::shared_ptr comm_pattern; if (communication_pattern.get() == NULL) { // Split the IndexSet of V in locally owned elements and ghost indices @@ -846,7 +846,7 @@ namespace LinearAlgebra else { comm_pattern = - std_cxx11::dynamic_pointer_cast (communication_pattern); + std::dynamic_pointer_cast (communication_pattern); AssertThrow(comm_pattern != NULL, ExcMessage("The communication pattern is not of type " "Utilities::MPI::Partitioner.")); diff --git a/include/deal.II/lac/la_vector.h b/include/deal.II/lac/la_vector.h index 18dbcf5d02..fb64b714e8 100644 --- a/include/deal.II/lac/la_vector.h +++ b/include/deal.II/lac/la_vector.h @@ -134,9 +134,9 @@ namespace LinearAlgebra */ virtual void import(const ReadWriteVector &V, VectorOperation::values operation, - std_cxx11::shared_ptr + std::shared_ptr communication_pattern = - std_cxx11::shared_ptr()); + std::shared_ptr()); /** * Add @p a to all components. Note that @p a is a scalar not a vector. @@ -384,7 +384,7 @@ namespace LinearAlgebra * @author Uwe Koecher, 2017 */ template -struct is_serial_vector< LinearAlgebra::Vector< Number > > : std_cxx11::true_type +struct is_serial_vector< LinearAlgebra::Vector< Number > > : std::true_type { }; diff --git a/include/deal.II/lac/la_vector.templates.h b/include/deal.II/lac/la_vector.templates.h index 15fe96fdde..460723c942 100644 --- a/include/deal.II/lac/la_vector.templates.h +++ b/include/deal.II/lac/la_vector.templates.h @@ -159,7 +159,7 @@ namespace LinearAlgebra template void Vector::import(const ReadWriteVector &, VectorOperation::values , - std_cxx11::shared_ptr) + std::shared_ptr) { AssertThrow(false, ExcMessage("This function is not implemented.")); } diff --git a/include/deal.II/lac/lapack_full_matrix.h b/include/deal.II/lac/lapack_full_matrix.h index 45688aae4c..f1a015e0f4 100644 --- a/include/deal.II/lac/lapack_full_matrix.h +++ b/include/deal.II/lac/lapack_full_matrix.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include @@ -662,13 +662,13 @@ private: * The matrix U in the singular value decomposition * USVT. */ - std_cxx11::shared_ptr > svd_u; + std::shared_ptr > svd_u; /** * The matrix VT in the singular value decomposition * USVT. */ - std_cxx11::shared_ptr > svd_vt; + std::shared_ptr > svd_vt; }; diff --git a/include/deal.II/lac/matrix_block.h b/include/deal.II/lac/matrix_block.h index 5402fa23a3..a03f437099 100644 --- a/include/deal.II/lac/matrix_block.h +++ b/include/deal.II/lac/matrix_block.h @@ -18,7 +18,6 @@ #include #include -#include #include #include #include @@ -27,6 +26,8 @@ #include #include +#include + DEAL_II_NAMESPACE_OPEN @@ -344,7 +345,7 @@ public: * The pointer type used for storing the objects. We use a shard pointer, * such that they get deleted automatically when not used anymore. */ - typedef std_cxx11::shared_ptr ptr_type; + typedef std::shared_ptr ptr_type; /** * Add a new matrix block at the position (row,column) in the block diff --git a/include/deal.II/lac/petsc_block_vector.h b/include/deal.II/lac/petsc_block_vector.h index 0b3eb5a122..5a9c18247c 100644 --- a/include/deal.II/lac/petsc_block_vector.h +++ b/include/deal.II/lac/petsc_block_vector.h @@ -504,7 +504,7 @@ namespace internal * @author Uwe Koecher, 2017 */ template <> -struct is_serial_vector< PETScWrappers::BlockVector > : std_cxx11::true_type +struct is_serial_vector< PETScWrappers::BlockVector > : std::true_type { }; diff --git a/include/deal.II/lac/petsc_matrix_base.h b/include/deal.II/lac/petsc_matrix_base.h index 2c4f07061b..5cbcfb16c1 100644 --- a/include/deal.II/lac/petsc_matrix_base.h +++ b/include/deal.II/lac/petsc_matrix_base.h @@ -28,10 +28,10 @@ # include # include -# include # include # include +# include DEAL_II_NAMESPACE_OPEN @@ -144,12 +144,12 @@ namespace PETScWrappers * performance, we keep a shared pointer to these entries so that more * than one accessor can access this data if necessary. */ - std_cxx11::shared_ptr > colnum_cache; + std::shared_ptr > colnum_cache; /** * Similar cache for the values of this row. */ - std_cxx11::shared_ptr > value_cache; + std::shared_ptr > value_cache; /** * Discard the old row caches (they may still be used by other diff --git a/include/deal.II/lac/petsc_parallel_block_vector.h b/include/deal.II/lac/petsc_parallel_block_vector.h index d6635821e7..3a4a547c48 100644 --- a/include/deal.II/lac/petsc_parallel_block_vector.h +++ b/include/deal.II/lac/petsc_parallel_block_vector.h @@ -582,7 +582,7 @@ namespace internal * @author Uwe Koecher, 2017 */ template <> -struct is_serial_vector< PETScWrappers::MPI::BlockVector > : std_cxx11::false_type +struct is_serial_vector< PETScWrappers::MPI::BlockVector > : std::false_type { }; diff --git a/include/deal.II/lac/petsc_parallel_vector.h b/include/deal.II/lac/petsc_parallel_vector.h index e61ae3d9c7..64adf03655 100644 --- a/include/deal.II/lac/petsc_parallel_vector.h +++ b/include/deal.II/lac/petsc_parallel_vector.h @@ -632,7 +632,7 @@ namespace internal * @author Uwe Koecher, 2017 */ template <> -struct is_serial_vector< PETScWrappers::MPI::Vector > : std_cxx11::false_type +struct is_serial_vector< PETScWrappers::MPI::Vector > : std::false_type { }; diff --git a/include/deal.II/lac/petsc_solver.h b/include/deal.II/lac/petsc_solver.h index 07628a3ef1..c3d0f28ae4 100644 --- a/include/deal.II/lac/petsc_solver.h +++ b/include/deal.II/lac/petsc_solver.h @@ -23,10 +23,11 @@ # include # include -# include # include +# include + #ifdef DEAL_II_WITH_SLEPC #include #endif @@ -250,7 +251,7 @@ namespace PETScWrappers * Pointer to an object that stores the solver context. This is recreated * in the main solver routine if necessary. */ - std_cxx11::shared_ptr solver_data; + std::shared_ptr solver_data; #ifdef DEAL_II_WITH_SLEPC /** @@ -994,7 +995,7 @@ namespace PETScWrappers PC pc; }; - std_cxx11::shared_ptr solver_data; + std::shared_ptr solver_data; /** * Flag specifies whether matrix being factorized is symmetric or not. It diff --git a/include/deal.II/lac/petsc_vector.h b/include/deal.II/lac/petsc_vector.h index 3686905b5b..fb3016ff9f 100644 --- a/include/deal.II/lac/petsc_vector.h +++ b/include/deal.II/lac/petsc_vector.h @@ -440,7 +440,7 @@ namespace internal * @author Uwe Koecher, 2017 */ template <> -struct is_serial_vector< PETScWrappers::Vector > : std_cxx11::true_type +struct is_serial_vector< PETScWrappers::Vector > : std::true_type { }; diff --git a/include/deal.II/lac/precondition.h b/include/deal.II/lac/precondition.h index d2e80e2515..0ea8991a07 100644 --- a/include/deal.II/lac/precondition.h +++ b/include/deal.II/lac/precondition.h @@ -996,7 +996,7 @@ public: /** * Stores the preconditioner object that the Chebyshev is wrapped around. */ - std_cxx11::shared_ptr preconditioner; + std::shared_ptr preconditioner; }; DEAL_II_ENABLE_EXTRA_DIAGNOSTICS @@ -1897,7 +1897,7 @@ namespace internal inline void initialize_preconditioner(const MatrixType &matrix, - std_cxx11::shared_ptr &preconditioner, + std::shared_ptr &preconditioner, VectorType &) { (void)matrix; @@ -1909,7 +1909,7 @@ namespace internal inline void initialize_preconditioner(const MatrixType &matrix, - std_cxx11::shared_ptr > &preconditioner, + std::shared_ptr > &preconditioner, VectorType &diagonal_inverse) { if (preconditioner.get() == NULL || @@ -2094,9 +2094,9 @@ PreconditionChebyshev::estimate_eigenv internal::PreconditionChebyshev::EigenvalueTracker eigenvalue_tracker; SolverCG solver (control); - solver.connect_eigenvalues_slot(std_cxx11::bind(&internal::PreconditionChebyshev::EigenvalueTracker::slot, - &eigenvalue_tracker, - std_cxx11::_1)); + solver.connect_eigenvalues_slot(std::bind(&internal::PreconditionChebyshev::EigenvalueTracker::slot, + &eigenvalue_tracker, + std::placeholders::_1)); // set an initial guess which is close to the constant vector but where // one entry is different to trigger high frequencies diff --git a/include/deal.II/lac/read_write_vector.h b/include/deal.II/lac/read_write_vector.h index 520dc4a198..3d15c23daa 100644 --- a/include/deal.II/lac/read_write_vector.h +++ b/include/deal.II/lac/read_write_vector.h @@ -270,8 +270,8 @@ namespace LinearAlgebra */ void import(const distributed::Vector &vec, VectorOperation::values operation, - std_cxx11::shared_ptr communication_pattern = - std_cxx11::shared_ptr ()); + std::shared_ptr communication_pattern = + std::shared_ptr ()); #ifdef DEAL_II_WITH_PETSC /** @@ -284,8 +284,8 @@ namespace LinearAlgebra */ void import(const PETScWrappers::MPI::Vector &petsc_vec, VectorOperation::values operation, - std_cxx11::shared_ptr communication_pattern = - std_cxx11::shared_ptr ()); + std::shared_ptr communication_pattern = + std::shared_ptr ()); #endif #ifdef DEAL_II_WITH_TRILINOS @@ -299,8 +299,8 @@ namespace LinearAlgebra */ void import(const TrilinosWrappers::MPI::Vector &trilinos_vec, VectorOperation::values operation, - std_cxx11::shared_ptr communication_pattern = - std_cxx11::shared_ptr ()); + std::shared_ptr communication_pattern = + std::shared_ptr ()); /** * Imports all the elements present in the vector's IndexSet from the input @@ -312,8 +312,8 @@ namespace LinearAlgebra */ void import(const EpetraWrappers::Vector &epetra_vec, VectorOperation::values operation, - std_cxx11::shared_ptr communication_pattern = - std_cxx11::shared_ptr ()); + std::shared_ptr communication_pattern = + std::shared_ptr ()); #endif #ifdef DEAL_II_WITH_CUDA @@ -325,8 +325,8 @@ namespace LinearAlgebra */ void import(const CUDAWrappers::Vector &cuda_vec, VectorOperation::values operation, - std_cxx11::shared_ptr communication_pattern = - std_cxx11::shared_ptr ()); + std::shared_ptr communication_pattern = + std::shared_ptr ()); #endif /** @@ -515,7 +515,7 @@ namespace LinearAlgebra const IndexSet &locally_owned_elements, VectorOperation::values operation, const MPI_Comm &mpi_comm, - std_cxx11::shared_ptr communication_pattern); + std::shared_ptr communication_pattern); #endif /** @@ -558,7 +558,7 @@ namespace LinearAlgebra * CommunicationPattern for the communication between the * source_stored_elements IndexSet and the current vector. */ - std_cxx11::shared_ptr comm_pattern; + std::shared_ptr comm_pattern; /** * Pointer to the array of local elements of this vector. @@ -569,7 +569,7 @@ namespace LinearAlgebra * For parallel loops with TBB, this member variable stores the affinity * information of loops. */ - mutable std_cxx11::shared_ptr< ::dealii::parallel::internal::TBBPartitioner> thread_loop_partitioner; + mutable std::shared_ptr< ::dealii::parallel::internal::TBBPartitioner> thread_loop_partitioner; /** * Make all other ReadWriteVector types friends. diff --git a/include/deal.II/lac/read_write_vector.templates.h b/include/deal.II/lac/read_write_vector.templates.h index 90e9d166a8..09a0d65ebe 100644 --- a/include/deal.II/lac/read_write_vector.templates.h +++ b/include/deal.II/lac/read_write_vector.templates.h @@ -201,11 +201,11 @@ namespace LinearAlgebra void ReadWriteVector::import(const distributed::Vector &vec, VectorOperation::values operation, - std_cxx11::shared_ptr communication_pattern) + std::shared_ptr communication_pattern) { // If no communication pattern is given, create one. Otherwise, use the // given one. - std_cxx11::shared_ptr comm_pattern; + std::shared_ptr comm_pattern; if (communication_pattern.get() == NULL) { comm_pattern.reset(new Utilities::MPI::Partitioner(vec.locally_owned_elements(), @@ -215,7 +215,7 @@ namespace LinearAlgebra else { comm_pattern = - std_cxx11::dynamic_pointer_cast (communication_pattern); + std::dynamic_pointer_cast (communication_pattern); AssertThrow(comm_pattern != NULL, ExcMessage("The communication pattern is not of type " "Utilities::MPI::Partitioner.")); @@ -270,7 +270,7 @@ namespace LinearAlgebra void ReadWriteVector::import(const PETScWrappers::MPI::Vector &petsc_vec, VectorOperation::values /*operation*/, - std_cxx11::shared_ptr /*communication_pattern*/) + std::shared_ptr /*communication_pattern*/) { //TODO: this works only if no communication is needed. Assert(petsc_vec.locally_owned_elements() == stored_elements, @@ -299,9 +299,9 @@ namespace LinearAlgebra const IndexSet &source_elements, VectorOperation::values operation, const MPI_Comm &mpi_comm, - std_cxx11::shared_ptr communication_pattern) + std::shared_ptr communication_pattern) { - std_cxx11::shared_ptr epetra_comm_pattern; + std::shared_ptr epetra_comm_pattern; // If no communication pattern is given, create one. Otherwise, use the one // given. @@ -314,18 +314,18 @@ namespace LinearAlgebra (source_elements == source_stored_elements)) { epetra_comm_pattern = - std_cxx11::dynamic_pointer_cast (comm_pattern); + std::dynamic_pointer_cast (comm_pattern); if (epetra_comm_pattern == NULL) - epetra_comm_pattern = std_cxx11::make_shared( + epetra_comm_pattern = std::make_shared( create_epetra_comm_pattern(source_elements, mpi_comm)); } else - epetra_comm_pattern = std_cxx11::make_shared( + epetra_comm_pattern = std::make_shared( create_epetra_comm_pattern(source_elements, mpi_comm)); } else { - epetra_comm_pattern = std_cxx11::dynamic_pointer_cast ( + epetra_comm_pattern = std::dynamic_pointer_cast ( communication_pattern); AssertThrow(epetra_comm_pattern != NULL, ExcMessage(std::string("The communication pattern is not of type ") + @@ -359,7 +359,7 @@ namespace LinearAlgebra void ReadWriteVector::import(const TrilinosWrappers::MPI::Vector &trilinos_vec, VectorOperation::values operation, - std_cxx11::shared_ptr communication_pattern) + std::shared_ptr communication_pattern) { import(trilinos_vec.trilinos_vector(), trilinos_vec.locally_owned_elements(), operation, trilinos_vec.get_mpi_communicator(), communication_pattern); @@ -371,7 +371,7 @@ namespace LinearAlgebra void ReadWriteVector::import(const LinearAlgebra::EpetraWrappers::Vector &trilinos_vec, VectorOperation::values operation, - std_cxx11::shared_ptr communication_pattern) + std::shared_ptr communication_pattern) { import(trilinos_vec.trilinos_vector(), trilinos_vec.locally_owned_elements(), operation, trilinos_vec.get_mpi_communicator(), communication_pattern); @@ -385,7 +385,7 @@ namespace LinearAlgebra void ReadWriteVector::import(const LinearAlgebra::CUDAWrappers::Vector &cuda_vec, VectorOperation::values operation, - std_cxx11::shared_ptr ) + std::shared_ptr ) { const unsigned int n_elements = stored_elements.n_elements(); if (operation == VectorOperation::insert) diff --git a/include/deal.II/lac/relaxation_block.templates.h b/include/deal.II/lac/relaxation_block.templates.h index cb6e2f271e..648f8f4894 100644 --- a/include/deal.II/lac/relaxation_block.templates.h +++ b/include/deal.II/lac/relaxation_block.templates.h @@ -102,8 +102,8 @@ RelaxationBlock::invert_diagblocks () { // compute blocks in parallel parallel::apply_to_subranges(0, this->additional_data->block_list.n_rows(), - std_cxx11::bind(&RelaxationBlock::block_kernel, this, - std_cxx11::_1, std_cxx11::_2), + std::bind(&RelaxationBlock::block_kernel, this, + std::placeholders::_1, std::placeholders::_2), 16); } this->inverses_computed(true); diff --git a/include/deal.II/lac/slepc_solver.h b/include/deal.II/lac/slepc_solver.h index 6b626b465e..e62ca174ba 100644 --- a/include/deal.II/lac/slepc_solver.h +++ b/include/deal.II/lac/slepc_solver.h @@ -21,8 +21,6 @@ #ifdef DEAL_II_WITH_SLEPC -# include -# include # include # include # include @@ -31,6 +29,8 @@ # include # include +# include + DEAL_II_NAMESPACE_OPEN /** diff --git a/include/deal.II/lac/slepc_spectral_transformation.h b/include/deal.II/lac/slepc_spectral_transformation.h index 3acb22debf..b7709af8e7 100644 --- a/include/deal.II/lac/slepc_spectral_transformation.h +++ b/include/deal.II/lac/slepc_spectral_transformation.h @@ -22,13 +22,14 @@ #ifdef DEAL_II_WITH_SLEPC -# include # include # include # include # include +# include + DEAL_II_NAMESPACE_OPEN namespace PETScWrappers diff --git a/include/deal.II/lac/solver.h b/include/deal.II/lac/solver.h index 5e5d24b23f..7cb88f15a2 100644 --- a/include/deal.II/lac/solver.h +++ b/include/deal.II/lac/solver.h @@ -211,7 +211,7 @@ template class Vector; * function). A pointer to a function with this argument list satisfies the * requirements, but you can also pass a member function whose * this argument has been bound using the - * std_cxx11::bind mechanism (see the example below). - Each of + * std::bind mechanism (see the example below). - Each of * the slots will return a value that indicates whether the iteration should * continue, should stop because it has succeeded, or stop because it has * failed. The return type of slots is therefore of type SolverControl::State. @@ -277,16 +277,16 @@ template class Vector; * SolverControl solver_control (1000, 1e-12); * SolverCG<> solver (solver_control); * - * solver.connect (std_cxx11::bind (&Step3::write_intermediate_solution, - * this, - * std_cxx11::_1, - * std_cxx11::_2, - * std_cxx11::_3)); + * solver.connect (std::bind (&Step3::write_intermediate_solution, + * this, + * std::placeholders::_1, + * std::placeholders::_2, + * std::placeholders::_3)); * solver.solve (system_matrix, solution, system_rhs, * PreconditionIdentity()); * } * @endcode - * The use of std_cxx11::bind here ensures that we convert the + * The use of std::bind here ensures that we convert the * member function with its three arguments plus the this * pointer, to a function that only takes three arguments, by fixing the * implicit this argument of the function to the @@ -383,9 +383,9 @@ public: * library for more information on connection management. */ boost::signals2::connection - connect (const std_cxx11::function &slot); + connect (const std::function &slot); @@ -504,10 +504,10 @@ Solver::Solver (SolverControl &solver_control, // only takes two arguments, the iteration and the check_value, and so // we simply ignore the third argument that is passed in whenever the // signal is executed - connect (std_cxx11::bind(&SolverControl::check, - std_cxx11::ref(solver_control), - std_cxx11::_1, - std_cxx11::_2)); + connect (std::bind(&SolverControl::check, + std::ref(solver_control), + std::placeholders::_1, + std::placeholders::_2)); } @@ -523,10 +523,10 @@ Solver::Solver (SolverControl &solver_control) // only takes two arguments, the iteration and the check_value, and so // we simply ignore the third argument that is passed in whenever the // signal is executed - connect (std_cxx11::bind(&SolverControl::check, - std_cxx11::ref(solver_control), - std_cxx11::_1, - std_cxx11::_2)); + connect (std::bind(&SolverControl::check, + std::ref(solver_control), + std::placeholders::_1, + std::placeholders::_2)); } @@ -535,9 +535,9 @@ template inline boost::signals2::connection Solver:: -connect (const std_cxx11::function &slot) +connect (const std::function &slot) { return iteration_status.connect (slot); } diff --git a/include/deal.II/lac/solver_cg.h b/include/deal.II/lac/solver_cg.h index 1170df1539..5024e8e960 100644 --- a/include/deal.II/lac/solver_cg.h +++ b/include/deal.II/lac/solver_cg.h @@ -190,7 +190,7 @@ public: */ boost::signals2::connection connect_coefficients_slot( - const std_cxx11::function &slot); + const std::function &slot); /** * Connect a slot to retrieve the estimated condition number. Called on each @@ -199,7 +199,7 @@ public: * divergence has been detected). */ boost::signals2::connection - connect_condition_number_slot(const std_cxx11::function &slot, + connect_condition_number_slot(const std::function &slot, const bool every_iteration=false); /** @@ -210,7 +210,7 @@ public: */ boost::signals2::connection connect_eigenvalues_slot( - const std_cxx11::function &)> &slot, + const std::function &)> &slot, const bool every_iteration=false); protected: @@ -596,7 +596,7 @@ SolverCG::solve (const MatrixType &A, template boost::signals2::connection SolverCG::connect_coefficients_slot -(const std_cxx11::function &slot) +(const std::function &slot) { return coefficients_signal.connect(slot); } @@ -606,7 +606,7 @@ SolverCG::connect_coefficients_slot template boost::signals2::connection SolverCG::connect_condition_number_slot -(const std_cxx11::function &slot, +(const std::function &slot, const bool every_iteration) { if (every_iteration) @@ -624,7 +624,7 @@ SolverCG::connect_condition_number_slot template boost::signals2::connection SolverCG::connect_eigenvalues_slot -(const std_cxx11::function &)> &slot, +(const std::function &)> &slot, const bool every_iteration) { if (every_iteration) diff --git a/include/deal.II/lac/solver_gmres.h b/include/deal.II/lac/solver_gmres.h index 087c17919c..9ae3e8b102 100644 --- a/include/deal.II/lac/solver_gmres.h +++ b/include/deal.II/lac/solver_gmres.h @@ -281,7 +281,7 @@ public: * or because divergence has been detected). */ boost::signals2::connection - connect_condition_number_slot(const std_cxx11::function &slot, + connect_condition_number_slot(const std::function &slot, const bool every_iteration=false); /** @@ -292,7 +292,7 @@ public: */ boost::signals2::connection connect_eigenvalues_slot( - const std_cxx11::function > &)> &slot, + const std::function > &)> &slot, const bool every_iteration=false); /** @@ -304,7 +304,7 @@ public: */ boost::signals2::connection connect_hessenberg_slot( - const std_cxx11::function &)> &slot, + const std::function &)> &slot, const bool every_iteration=true); /** @@ -315,7 +315,7 @@ public: */ boost::signals2::connection connect_krylov_space_slot( - const std_cxx11::function &)> &slot); + const std::function &)> &slot); DeclException1 (ExcTooFewTmpVectors, @@ -1114,7 +1114,7 @@ SolverGMRES::solve (const MatrixType &A, template boost::signals2::connection SolverGMRES::connect_condition_number_slot -(const std_cxx11::function &slot, +(const std::function &slot, const bool every_iteration) { if (every_iteration) @@ -1132,7 +1132,7 @@ SolverGMRES::connect_condition_number_slot template boost::signals2::connection SolverGMRES::connect_eigenvalues_slot -(const std_cxx11::function > &)> &slot, +(const std::function > &)> &slot, const bool every_iteration) { if (every_iteration) @@ -1150,7 +1150,7 @@ SolverGMRES::connect_eigenvalues_slot template boost::signals2::connection SolverGMRES::connect_hessenberg_slot -(const std_cxx11::function &)> &slot, +(const std::function &)> &slot, const bool every_iteration) { if (every_iteration) @@ -1168,7 +1168,7 @@ SolverGMRES::connect_hessenberg_slot template boost::signals2::connection SolverGMRES::connect_krylov_space_slot -(const std_cxx11::function &)> &slot) +(const std::function &)> &slot) { return krylov_space_signal.connect(slot); } diff --git a/include/deal.II/lac/sparse_matrix.templates.h b/include/deal.II/lac/sparse_matrix.templates.h index 3a795115ae..23aa9084b6 100644 --- a/include/deal.II/lac/sparse_matrix.templates.h +++ b/include/deal.II/lac/sparse_matrix.templates.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include @@ -206,10 +206,10 @@ SparseMatrix::operator = (const double d) (cols->n_nonzero_elements()+m()) / m(); if (matrix_size>grain_size) parallel::apply_to_subranges (0U, matrix_size, - std_cxx11::bind(&internal::SparseMatrix::template - zero_subrange, - std_cxx11::_1, std_cxx11::_2, - val), + std::bind(&internal::SparseMatrix::template + zero_subrange, + std::placeholders::_1, std::placeholders::_2, + val), grain_size); else if (matrix_size > 0) std::memset (&val[0], 0, matrix_size*sizeof(number)); @@ -765,15 +765,15 @@ SparseMatrix::vmult (OutVector &dst, Assert (!PointerComparison::equal(&src, &dst), ExcSourceEqualsDestination()); parallel::apply_to_subranges (0U, m(), - std_cxx11::bind (&internal::SparseMatrix::vmult_on_subrange - , - std_cxx11::_1, std_cxx11::_2, - val, - cols->rowstart, - cols->colnums, - std_cxx11::cref(src), - std_cxx11::ref(dst), - false), + std::bind (&internal::SparseMatrix::vmult_on_subrange + , + std::placeholders::_1, std::placeholders::_2, + val, + cols->rowstart, + cols->colnums, + std::cref(src), + std::ref(dst), + false), internal::SparseMatrix::minimum_parallel_grain_size); } @@ -820,15 +820,15 @@ SparseMatrix::vmult_add (OutVector &dst, Assert (!PointerComparison::equal(&src, &dst), ExcSourceEqualsDestination()); parallel::apply_to_subranges (0U, m(), - std_cxx11::bind (&internal::SparseMatrix::vmult_on_subrange - , - std_cxx11::_1, std_cxx11::_2, - val, - cols->rowstart, - cols->colnums, - std_cxx11::cref(src), - std_cxx11::ref(dst), - true), + std::bind (&internal::SparseMatrix::vmult_on_subrange + , + std::placeholders::_1, std::placeholders::_2, + val, + cols->rowstart, + cols->colnums, + std::cref(src), + std::ref(dst), + true), internal::SparseMatrix::minimum_parallel_grain_size); } @@ -906,11 +906,11 @@ SparseMatrix::matrix_norm_square (const Vector &v) const return parallel::accumulate_from_subranges - (std_cxx11::bind (&internal::SparseMatrix::matrix_norm_sqr_on_subrange - >, - std_cxx11::_1, std_cxx11::_2, - val, cols->rowstart, cols->colnums, - std_cxx11::cref(v)), + (std::bind (&internal::SparseMatrix::matrix_norm_sqr_on_subrange + >, + std::placeholders::_1, std::placeholders::_2, + val, cols->rowstart, cols->colnums, + std::cref(v)), 0, m(), internal::SparseMatrix::minimum_parallel_grain_size); } @@ -969,12 +969,12 @@ SparseMatrix::matrix_scalar_product (const Vector &u, return parallel::accumulate_from_subranges - (std_cxx11::bind (&internal::SparseMatrix::matrix_scalar_product_on_subrange - >, - std_cxx11::_1, std_cxx11::_2, - val, cols->rowstart, cols->colnums, - std_cxx11::cref(u), - std_cxx11::cref(v)), + (std::bind (&internal::SparseMatrix::matrix_scalar_product_on_subrange + >, + std::placeholders::_1, std::placeholders::_2, + val, cols->rowstart, cols->colnums, + std::cref(u), + std::cref(v)), 0, m(), internal::SparseMatrix::minimum_parallel_grain_size); } @@ -1356,13 +1356,13 @@ SparseMatrix::residual (Vector &dst, return std::sqrt (parallel::accumulate_from_subranges - (std_cxx11::bind (&internal::SparseMatrix::residual_sqr_on_subrange - ,Vector >, - std_cxx11::_1, std_cxx11::_2, - val, cols->rowstart, cols->colnums, - std_cxx11::cref(u), - std_cxx11::cref(b), - std_cxx11::ref(dst)), + (std::bind (&internal::SparseMatrix::residual_sqr_on_subrange + ,Vector >, + std::placeholders::_1, std::placeholders::_2, + val, cols->rowstart, cols->colnums, + std::cref(u), + std::cref(b), + std::ref(dst)), 0, m(), internal::SparseMatrix::minimum_parallel_grain_size)); } diff --git a/include/deal.II/lac/trilinos_block_vector.h b/include/deal.II/lac/trilinos_block_vector.h index 22571c218a..6d011b3730 100644 --- a/include/deal.II/lac/trilinos_block_vector.h +++ b/include/deal.II/lac/trilinos_block_vector.h @@ -502,7 +502,7 @@ namespace internal * @author Uwe Koecher, 2017 */ template <> -struct is_serial_vector< TrilinosWrappers::BlockVector > : std_cxx11::true_type +struct is_serial_vector< TrilinosWrappers::BlockVector > : std::true_type { }; @@ -513,7 +513,7 @@ struct is_serial_vector< TrilinosWrappers::BlockVector > : std_cxx11::true_type * @author Uwe Koecher, 2017 */ template <> -struct is_serial_vector< TrilinosWrappers::MPI::BlockVector > : std_cxx11::false_type +struct is_serial_vector< TrilinosWrappers::MPI::BlockVector > : std::false_type { }; diff --git a/include/deal.II/lac/trilinos_epetra_communication_pattern.h b/include/deal.II/lac/trilinos_epetra_communication_pattern.h index 5e8a9ffc5f..fd10b105bf 100644 --- a/include/deal.II/lac/trilinos_epetra_communication_pattern.h +++ b/include/deal.II/lac/trilinos_epetra_communication_pattern.h @@ -23,9 +23,9 @@ #ifdef DEAL_II_WITH_MPI -#include #include #include "Epetra_Import.h" +#include DEAL_II_NAMESPACE_OPEN @@ -71,12 +71,12 @@ namespace LinearAlgebra /** * Shared pointer to the MPI communicator used. */ - std_cxx11::shared_ptr comm; + std::shared_ptr comm; /** * Shared pointer to the Epetra_Import object used. */ - std_cxx11::shared_ptr import; + std::shared_ptr import; }; } // end of namespace EpetraWrappers } // end of namespace LinearAlgebra diff --git a/include/deal.II/lac/trilinos_epetra_vector.h b/include/deal.II/lac/trilinos_epetra_vector.h index efcecfce84..c08d843ca6 100644 --- a/include/deal.II/lac/trilinos_epetra_vector.h +++ b/include/deal.II/lac/trilinos_epetra_vector.h @@ -24,7 +24,6 @@ #ifdef DEAL_II_WITH_MPI #include -#include #include #include #include @@ -69,7 +68,7 @@ namespace LinearAlgebra * This constructor takes an IndexSet that defines how to distribute the * individual components among the MPI processors. Since it also * includes information about the size of the vector, this is all we - * need to genereate a %parallel vector. + * need to generate a %parallel vector. */ explicit Vector(const IndexSet ¶llel_partitioner, const MPI_Comm &communicator); @@ -101,8 +100,8 @@ namespace LinearAlgebra */ virtual void import(const ReadWriteVector &V, VectorOperation::values operation, - std_cxx11::shared_ptr communication_pattern = - std_cxx11::shared_ptr ()); + std::shared_ptr communication_pattern = + std::shared_ptr ()); /** * Multiply the entire vector by a fixed factor. @@ -296,7 +295,7 @@ namespace LinearAlgebra /** * Pointer to the actual Epetra vector object. */ - std_cxx11::shared_ptr vector; + std::shared_ptr vector; /** * IndexSet of the elements of the last imported vector. @@ -307,7 +306,7 @@ namespace LinearAlgebra * CommunicationPattern for the communication between the * source_stored_elements IndexSet and the current vector. */ - std_cxx11::shared_ptr epetra_comm_pattern; + std::shared_ptr epetra_comm_pattern; }; } } diff --git a/include/deal.II/lac/trilinos_precondition.h b/include/deal.II/lac/trilinos_precondition.h index 94d6b3f97f..d6b70df82a 100644 --- a/include/deal.II/lac/trilinos_precondition.h +++ b/include/deal.II/lac/trilinos_precondition.h @@ -22,11 +22,12 @@ #ifdef DEAL_II_WITH_TRILINOS # include -# include # include # include +# include + DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # ifdef DEAL_II_WITH_MPI # include @@ -224,7 +225,7 @@ namespace TrilinosWrappers * This is a pointer to the preconditioner object that is used when * applying the preconditioner. */ - std_cxx11::shared_ptr preconditioner; + std::shared_ptr preconditioner; /** * Internal communication pattern in case the matrix needs to be copied @@ -240,7 +241,7 @@ namespace TrilinosWrappers * Internal Trilinos map in case the matrix needs to be copied from * deal.II format. */ - std_cxx11::shared_ptr vector_distributor; + std::shared_ptr vector_distributor; }; @@ -1604,7 +1605,7 @@ namespace TrilinosWrappers /** * A copy of the deal.II matrix into Trilinos format. */ - std_cxx11::shared_ptr trilinos_matrix; + std::shared_ptr trilinos_matrix; }; @@ -1839,7 +1840,7 @@ namespace TrilinosWrappers /** * A copy of the deal.II matrix into Trilinos format. */ - std_cxx11::shared_ptr trilinos_matrix; + std::shared_ptr trilinos_matrix; }; #endif diff --git a/include/deal.II/lac/trilinos_solver.h b/include/deal.II/lac/trilinos_solver.h index b846247506..1375034e8a 100644 --- a/include/deal.II/lac/trilinos_solver.h +++ b/include/deal.II/lac/trilinos_solver.h @@ -21,12 +21,13 @@ #ifdef DEAL_II_WITH_TRILINOS -# include # include # include # include # include +# include + DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include @@ -321,13 +322,13 @@ namespace TrilinosWrappers * side vector and the solution vector, which is passed down to the * Trilinos solver. */ - std_cxx11::shared_ptr linear_problem; + std::shared_ptr linear_problem; /** * A structure that contains a Trilinos object that can query the linear * solver and determine whether the convergence criterion have been met. */ - std_cxx11::shared_ptr status_test; + std::shared_ptr status_test; /** * A structure that contains the Trilinos solver and preconditioner @@ -745,13 +746,13 @@ namespace TrilinosWrappers * side vector and the solution vector, which is passed down to the * Trilinos solver. */ - std_cxx11::shared_ptr linear_problem; + std::shared_ptr linear_problem; /** * A structure that contains the Trilinos solver and preconditioner * objects. */ - std_cxx11::shared_ptr solver; + std::shared_ptr solver; /** * Store a copy of the flags for this particular solver. diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h index bb93520f69..51e9162848 100644 --- a/include/deal.II/lac/trilinos_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_sparse_matrix.h @@ -21,7 +21,6 @@ #ifdef DEAL_II_WITH_TRILINOS -# include # include # include # include @@ -172,12 +171,12 @@ namespace TrilinosWrappers * performance, we keep a shared pointer to these entries so that more * than one accessor can access this data if necessary. */ - std_cxx11::shared_ptr > colnum_cache; + std::shared_ptr > colnum_cache; /** * Cache for the values of this row. */ - std_cxx11::shared_ptr > value_cache; + std::shared_ptr > value_cache; }; /** @@ -2000,26 +1999,26 @@ namespace TrilinosWrappers * Pointer to the user-supplied Epetra Trilinos mapping of the matrix * columns that assigns parts of the matrix to the individual processes. */ - std_cxx11::shared_ptr column_space_map; + std::shared_ptr column_space_map; /** * A sparse matrix object in Trilinos to be used for finite element based * problems which allows for assembling into non-local elements. The * actual type, a sparse matrix, is set in the constructor. */ - std_cxx11::shared_ptr matrix; + std::shared_ptr matrix; /** * A sparse matrix object in Trilinos to be used for collecting the non- * local elements if the matrix was constructed from a Trilinos sparsity * pattern with the respective option. */ - std_cxx11::shared_ptr nonlocal_matrix; + std::shared_ptr nonlocal_matrix; /** * An export object used to communicate the nonlocal matrix. */ - std_cxx11::shared_ptr nonlocal_matrix_exporter; + std::shared_ptr nonlocal_matrix_exporter; /** * Trilinos doesn't allow to mix additions to matrix entries and diff --git a/include/deal.II/lac/trilinos_sparsity_pattern.h b/include/deal.II/lac/trilinos_sparsity_pattern.h index f314a7c77e..5230b2e743 100644 --- a/include/deal.II/lac/trilinos_sparsity_pattern.h +++ b/include/deal.II/lac/trilinos_sparsity_pattern.h @@ -29,7 +29,6 @@ # include # include -# include DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include @@ -146,7 +145,7 @@ namespace TrilinosWrappers * performance, we keep a shared pointer to these entries so that more * than one accessor can access this data if necessary. */ - std_cxx11::shared_ptr > colnum_cache; + std::shared_ptr > colnum_cache; /** * Discard the old row caches (they may still be used by other @@ -1143,14 +1142,14 @@ namespace TrilinosWrappers * Pointer to the user-supplied Epetra Trilinos mapping of the matrix * columns that assigns parts of the matrix to the individual processes. */ - std_cxx11::shared_ptr column_space_map; + std::shared_ptr column_space_map; /** * A sparsity pattern object in Trilinos to be used for finite element * based problems which allows for adding non-local elements to the * pattern. */ - std_cxx11::shared_ptr graph; + std::shared_ptr graph; /** * A sparsity pattern object for the non-local part of the sparsity @@ -1158,7 +1157,7 @@ namespace TrilinosWrappers * when the particular constructor or reinit method with writable_rows * argument is set */ - std_cxx11::shared_ptr nonlocal_graph; + std::shared_ptr nonlocal_graph; friend class TrilinosWrappers::SparseMatrix; friend class SparsityPatternIterators::Accessor; diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h index 1c6a99bd5c..c60cec7aed 100644 --- a/include/deal.II/lac/trilinos_vector.h +++ b/include/deal.II/lac/trilinos_vector.h @@ -21,7 +21,6 @@ #ifdef DEAL_II_WITH_TRILINOS -# include # include # include # include @@ -35,6 +34,8 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include "Epetra_LocalMap.h" DEAL_II_ENABLE_EXTRA_DIAGNOSTICS +#include + DEAL_II_NAMESPACE_OPEN @@ -1094,7 +1095,7 @@ namespace internal * @author Uwe Koecher, 2017 */ template <> -struct is_serial_vector< TrilinosWrappers::Vector > : std_cxx11::true_type +struct is_serial_vector< TrilinosWrappers::Vector > : std::true_type { }; @@ -1105,7 +1106,7 @@ struct is_serial_vector< TrilinosWrappers::Vector > : std_cxx11::true_type * @author Uwe Koecher, 2017 */ template <> -struct is_serial_vector< TrilinosWrappers::MPI::Vector > : std_cxx11::false_type +struct is_serial_vector< TrilinosWrappers::MPI::Vector > : std::false_type { }; diff --git a/include/deal.II/lac/trilinos_vector_base.h b/include/deal.II/lac/trilinos_vector_base.h index 9009682b2b..d0472a32e0 100644 --- a/include/deal.II/lac/trilinos_vector_base.h +++ b/include/deal.II/lac/trilinos_vector_base.h @@ -22,7 +22,6 @@ #ifdef DEAL_II_WITH_TRILINOS #include -# include # include # include # include @@ -934,14 +933,14 @@ namespace TrilinosWrappers * that is in fact distributed among multiple processors. The object * requires an existing Epetra_Map for storing data when setting it up. */ - std_cxx11::shared_ptr vector; + std::shared_ptr vector; /** * A vector object in Trilinos to be used for collecting the non-local * elements if the vector was constructed with an additional IndexSet * describing ghost elements. */ - std_cxx11::shared_ptr nonlocal_vector; + std::shared_ptr nonlocal_vector; /** * An IndexSet storing the indices this vector owns exclusively. diff --git a/include/deal.II/lac/vector.h b/include/deal.II/lac/vector.h index 4c63d2aa68..6798ecc460 100644 --- a/include/deal.II/lac/vector.h +++ b/include/deal.II/lac/vector.h @@ -1013,7 +1013,7 @@ protected: * For parallel loops with TBB, this member variable stores the affinity * information of loops. */ - mutable std_cxx11::shared_ptr thread_loop_partitioner; + mutable std::shared_ptr thread_loop_partitioner; /** * Make all other vector types friends. @@ -1440,7 +1440,7 @@ operator << (LogStream &os, const Vector &v) * @author Uwe Koecher, 2017 */ template -struct is_serial_vector< Vector > : std_cxx11::true_type +struct is_serial_vector< Vector > : std::true_type { }; diff --git a/include/deal.II/lac/vector_operations_internal.h b/include/deal.II/lac/vector_operations_internal.h index 991e1cf1ff..08370b0db8 100644 --- a/include/deal.II/lac/vector_operations_internal.h +++ b/include/deal.II/lac/vector_operations_internal.h @@ -161,7 +161,7 @@ namespace internal void parallel_for(Functor &functor, size_type start, size_type end, - std_cxx11::shared_ptr &partitioner) + std::shared_ptr &partitioner) { #ifdef DEAL_II_WITH_THREADS size_type vec_size = end-start; @@ -173,7 +173,7 @@ namespace internal Assert(partitioner.get() != NULL, ExcInternalError("Unexpected initialization of Vector that does " "not set the TBB partitioner to a usable state.")); - std_cxx11::shared_ptr tbb_partitioner = + std::shared_ptr tbb_partitioner = partitioner->acquire_one_partitioner(); TBBForFunctor generic_functor(functor, start, end); @@ -1255,7 +1255,7 @@ namespace internal const size_type start, const size_type end, ResultType &result, - std_cxx11::shared_ptr &partitioner) + std::shared_ptr &partitioner) { #ifdef DEAL_II_WITH_THREADS size_type vec_size = end-start; @@ -1267,7 +1267,7 @@ namespace internal Assert(partitioner.get() != NULL, ExcInternalError("Unexpected initialization of Vector that does " "not set the TBB partitioner to a usable state.")); - std_cxx11::shared_ptr tbb_partitioner = + std::shared_ptr tbb_partitioner = partitioner->acquire_one_partitioner(); TBBReduceFunctor generic_functor(op, start, end); diff --git a/include/deal.II/lac/vector_space_vector.h b/include/deal.II/lac/vector_space_vector.h index b7158fa412..ee966cc76d 100644 --- a/include/deal.II/lac/vector_space_vector.h +++ b/include/deal.II/lac/vector_space_vector.h @@ -18,9 +18,10 @@ #include #include -#include #include +#include + DEAL_II_NAMESPACE_OPEN @@ -85,8 +86,8 @@ namespace LinearAlgebra */ virtual void import(const ReadWriteVector &V, VectorOperation::values operation, - std_cxx11::shared_ptr communication_pattern = - std_cxx11::shared_ptr ()) = 0; + std::shared_ptr communication_pattern = + std::shared_ptr ()) = 0; /** * Return the scalar product of two vectors. diff --git a/include/deal.II/lac/vector_type_traits.h b/include/deal.II/lac/vector_type_traits.h index db8a45fbe9..18a455a144 100644 --- a/include/deal.II/lac/vector_type_traits.h +++ b/include/deal.II/lac/vector_type_traits.h @@ -16,7 +16,9 @@ #ifndef dealii__vector_type_traits_h #define dealii__vector_type_traits_h -#include +#include + +#include DEAL_II_NAMESPACE_OPEN @@ -29,12 +31,12 @@ DEAL_II_NAMESPACE_OPEN * The specialization * @code * template <> - * struct is_serial_vector< VectorType > : std_cxx11::true_type {}; + * struct is_serial_vector< VectorType > : std::true_type {}; * @endcode * for a serial vector type, respectively, * @code * template <> - * struct is_serial_vector< VectorType > : std_cxx11::false_type {}; + * struct is_serial_vector< VectorType > : std::false_type {}; * @endcode * for a vector type with support of distributed storage, * must be done in a header file of a vector declaration. diff --git a/include/deal.II/matrix_free/dof_info.h b/include/deal.II/matrix_free/dof_info.h index 8d8e411ab4..0ce8303d50 100644 --- a/include/deal.II/matrix_free/dof_info.h +++ b/include/deal.II/matrix_free/dof_info.h @@ -26,8 +26,7 @@ #include #include -#include - +#include #include @@ -307,7 +306,7 @@ namespace internal * certain structure in the indices, like indices for vector-valued * problems or for cells where not all vector components are filled. */ - std::vector > row_starts; + std::vector > row_starts; /** * Stores the indices of the degrees of freedom for each cell. These @@ -343,7 +342,7 @@ namespace internal * in the vector, and also includes how the ghosts look like. This * enables initialization of vectors based on the DoFInfo field. */ - std_cxx11::shared_ptr vector_partitioner; + std::shared_ptr vector_partitioner; /** * This stores a (sorted) list of all locally owned degrees of freedom diff --git a/include/deal.II/matrix_free/dof_info.templates.h b/include/deal.II/matrix_free/dof_info.templates.h index 887f3b5001..b1abd0d1c0 100644 --- a/include/deal.II/matrix_free/dof_info.templates.h +++ b/include/deal.II/matrix_free/dof_info.templates.h @@ -611,7 +611,7 @@ no_constraint: std::swap (new_active_fe_index, cell_active_fe_index); } - std::vector > new_row_starts; + std::vector > new_row_starts; std::vector new_dof_indices; std::vector > new_constraint_indicator; @@ -1926,7 +1926,7 @@ not_connect: DoFInfo::memory_consumption () const { std::size_t memory = sizeof(*this); - memory += (row_starts.capacity()*sizeof(std_cxx11::array)); + memory += (row_starts.capacity()*sizeof(std::array)); memory += MemoryConsumption::memory_consumption (dof_indices); memory += MemoryConsumption::memory_consumption (row_starts_plain_indices); memory += MemoryConsumption::memory_consumption (plain_dof_indices); @@ -1944,7 +1944,7 @@ not_connect: { out << " Memory row starts indices: "; size_info.print_memory_statistics - (out, (row_starts.capacity()*sizeof(std_cxx11::array))); + (out, (row_starts.capacity()*sizeof(std::array))); out << " Memory dof indices: "; size_info.print_memory_statistics (out, MemoryConsumption::memory_consumption (dof_indices)); diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h index ea77ffa148..a239c1f43b 100644 --- a/include/deal.II/matrix_free/fe_evaluation.h +++ b/include/deal.II/matrix_free/fe_evaluation.h @@ -874,7 +874,7 @@ protected: * Geometry data that can be generated FEValues on the fly with the * respective constructor. */ - std_cxx1x::shared_ptr > mapped_geometry; + std::shared_ptr > mapped_geometry; /** * For use with on-the-fly evaluation, provide a data structure to store the diff --git a/include/deal.II/matrix_free/mapping_info.templates.h b/include/deal.II/matrix_free/mapping_info.templates.h index 73024233a6..6e32bb1c46 100644 --- a/include/deal.II/matrix_free/mapping_info.templates.h +++ b/include/deal.II/matrix_free/mapping_info.templates.h @@ -242,7 +242,7 @@ namespace internal // hp::DoFHandler::active_cell_iterator, we need to manually // select the correct finite element, so just hold a vector of // FEValues - std::vector > > + std::vector > > fe_values (current_data.quadrature.size()); UpdateFlags update_flags_feval = ((update_flags & update_inverse_jacobians) ? update_jacobians : update_default) | diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h index 3d58469299..f7dea7f121 100644 --- a/include/deal.II/matrix_free/matrix_free.h +++ b/include/deal.II/matrix_free/matrix_free.h @@ -490,11 +490,11 @@ public: * to the function object. */ template - void cell_loop (const std_cxx11::function &, - OutVector &, - const InVector &, - const std::pair &)> &cell_operation, + void cell_loop (const std::function &, + OutVector &, + const InVector &, + const std::pair &)> &cell_operation, OutVector &dst, const InVector &src) const; @@ -503,7 +503,7 @@ public: * a function pointer to a member function of class @p CLASS with the * signature cell_operation (const MatrixFree &, OutVector * &, InVector &, std::pair&)const. This - * method obviates the need to call std_cxx11::bind to bind the class into + * method obviates the need to call std::bind to bind the class into * the given function in case the local function needs to access data in the * class (i.e., it is a non-static member function). */ @@ -617,7 +617,7 @@ public: * usually prefer this data structure as the data exchange information can * be reused from one vector to another. */ - const std_cxx11::shared_ptr & + const std::shared_ptr & get_vector_partitioner (const unsigned int vector_component=0) const; /** @@ -1097,7 +1097,7 @@ MatrixFree::initialize_dof_vector(LinearAlgebra::distributed::Vector template inline -const std_cxx11::shared_ptr & +const std::shared_ptr & MatrixFree::get_vector_partitioner (const unsigned int comp) const { AssertIndexRange (comp, n_components()); @@ -2386,11 +2386,11 @@ template inline void MatrixFree::cell_loop -(const std_cxx11::function &, - OutVector &, - const InVector &, - const std::pair &)> &cell_operation, +(const std::function &, + OutVector &, + const InVector &, + const std::pair &)> &cell_operation, OutVector &dst, const InVector &src) const { @@ -2406,14 +2406,14 @@ MatrixFree::cell_loop // to simplify the function calls, bind away all arguments except the // cell range typedef - std_cxx11::function &range)> + std::function &range)> Worker; - const Worker func = std_cxx11::bind (std_cxx11::ref(cell_operation), - std_cxx11::cref(*this), - std_cxx11::ref(dst), - std_cxx11::cref(src), - std_cxx11::_1); + const Worker func = std::bind (std::ref(cell_operation), + std::cref(*this), + std::ref(dst), + std::cref(src), + std::placeholders::_1); if (task_info.use_partition_partition == true) { @@ -2681,19 +2681,19 @@ MatrixFree::cell_loop OutVector &dst, const InVector &src) const { - // here, use std_cxx11::bind to hand a function handler with the appropriate + // here, use std::bind to hand a function handler with the appropriate // argument to the other loop function - std_cxx11::function &, - OutVector &, - const InVector &, - const std::pair &)> - function = std_cxx11::bind(function_pointer, - owning_class, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3, - std_cxx11::_4); + std::function &, + OutVector &, + const InVector &, + const std::pair &)> + function = std::bind(function_pointer, + owning_class, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3, + std::placeholders::_4); cell_loop (function, dst, src); } @@ -2713,19 +2713,19 @@ MatrixFree::cell_loop OutVector &dst, const InVector &src) const { - // here, use std_cxx11::bind to hand a function handler with the appropriate + // here, use std::bind to hand a function handler with the appropriate // argument to the other loop function - std_cxx11::function &, - OutVector &, - const InVector &, - const std::pair &)> - function = std_cxx11::bind(function_pointer, - owning_class, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3, - std_cxx11::_4); + std::function &, + OutVector &, + const InVector &, + const std::pair &)> + function = std::bind(function_pointer, + owning_class, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3, + std::placeholders::_4); cell_loop (function, dst, src); } diff --git a/include/deal.II/matrix_free/operators.h b/include/deal.II/matrix_free/operators.h index f14bc021ba..d8e6ccf46d 100644 --- a/include/deal.II/matrix_free/operators.h +++ b/include/deal.II/matrix_free/operators.h @@ -41,7 +41,7 @@ namespace MatrixFreeOperators // workaroud for unifying non-block vector and block vector implementations // a non-block vector has one block and the only subblock is the vector itself template - typename std_cxx11::enable_if::value, + typename std::enable_if::value, unsigned int>::type n_blocks(const VectorType &vector) { @@ -49,7 +49,7 @@ namespace MatrixFreeOperators } template - typename std_cxx11::enable_if::value, + typename std::enable_if::value, unsigned int>::type n_blocks(const VectorType &) { @@ -57,7 +57,7 @@ namespace MatrixFreeOperators } template - typename std_cxx11::enable_if::value, + typename std::enable_if::value, typename VectorType::BlockType &>::type subblock(VectorType &vector, unsigned int block_no) { @@ -65,7 +65,7 @@ namespace MatrixFreeOperators } template - typename std_cxx11::enable_if::value, + typename std::enable_if::value, const typename VectorType::BlockType &>::type subblock(const VectorType &vector, unsigned int block_no) { @@ -74,7 +74,7 @@ namespace MatrixFreeOperators } template - typename std_cxx11::enable_if::value, + typename std::enable_if::value, VectorType &>::type subblock(VectorType &vector, unsigned int) { @@ -82,7 +82,7 @@ namespace MatrixFreeOperators } template - typename std_cxx11::enable_if::value, + typename std::enable_if::value, const VectorType &>::type subblock(const VectorType &vector, unsigned int) { @@ -90,7 +90,7 @@ namespace MatrixFreeOperators } template - typename std_cxx11::enable_if::value, + typename std::enable_if::value, void>::type collect_sizes(VectorType &vector) { @@ -98,7 +98,7 @@ namespace MatrixFreeOperators } template - typename std_cxx11::enable_if::value, + typename std::enable_if::value, void>::type collect_sizes(const VectorType &) {} @@ -206,7 +206,7 @@ namespace MatrixFreeOperators * column selection vector is empty, it is taken the same as the row * selection, defining a diagonal block. */ - void initialize (std_cxx11::shared_ptr > data, + void initialize (std::shared_ptr > data, const std::vector &selected_row_blocks = std::vector(), const std::vector &selected_column_blocks = std::vector()); @@ -223,7 +223,7 @@ namespace MatrixFreeOperators * columns is used as opposed to the non-level initialization function. If * empty, all components are selected. */ - void initialize (std_cxx11::shared_ptr > data, + void initialize (std::shared_ptr > data, const MGConstrainedDoFs &mg_constrained_dofs, const unsigned int level, const std::vector &selected_row_blocks = std::vector()); @@ -243,7 +243,7 @@ namespace MatrixFreeOperators * empty, all components are selected. */ void - initialize(std_cxx11::shared_ptr > data_, + initialize(std::shared_ptr > data_, const std::vector &mg_constrained_dofs, const unsigned int level, const std::vector &selected_row_blocks = std::vector()); @@ -322,13 +322,13 @@ namespace MatrixFreeOperators /** * Get read access to the MatrixFree object stored with this operator. */ - std_cxx11::shared_ptr > + std::shared_ptr > get_matrix_free () const; /** * Get read access to the inverse diagonal of this operator. */ - const std_cxx11::shared_ptr > & + const std::shared_ptr > & get_matrix_diagonal_inverse() const; /** @@ -365,13 +365,13 @@ namespace MatrixFreeOperators /** * MatrixFree object to be used with this operator. */ - std_cxx11::shared_ptr > data; + std::shared_ptr > data; /** * A shared pointer to a diagonal matrix that stores the inverse of * diagonal elements as a vector. */ - std_cxx11::shared_ptr > inverse_diagonal_entries; + std::shared_ptr > inverse_diagonal_entries; /** * A vector which defines the selection of sub-components of MatrixFree @@ -675,8 +675,8 @@ namespace MatrixFreeOperators * * Such tables can be initialized by * @code - * std_cxx11::shared_ptr > > coefficient; - * coefficient = std_cxx11::make_shared > >(); + * std::shared_ptr > > coefficient; + * coefficient = std::make_shared > >(); * { * FEEvaluation fe_eval(mf_data); * const unsigned int n_cells = mf_data.n_macro_cells(); @@ -705,7 +705,7 @@ namespace MatrixFreeOperators * of scope in user code and the clear() command or destructor of this class * will delete the table. */ - void set_coefficient(const std_cxx11::shared_ptr > > &scalar_coefficient ); + void set_coefficient(const std::shared_ptr > > &scalar_coefficient ); virtual void clear(); @@ -715,7 +715,7 @@ namespace MatrixFreeOperators * The function will throw an error if coefficients are not previously set * by set_coefficient() function. */ - std_cxx11::shared_ptr< Table<2, VectorizedArray > > get_coefficient(); + std::shared_ptr< Table<2, VectorizedArray > > get_coefficient(); private: /** @@ -751,7 +751,7 @@ namespace MatrixFreeOperators /** * User-provided heterogeneity coefficient. */ - std_cxx11::shared_ptr< Table<2, VectorizedArray > > scalar_coefficient; + std::shared_ptr< Table<2, VectorizedArray > > scalar_coefficient; }; @@ -967,7 +967,7 @@ namespace MatrixFreeOperators template void Base:: - initialize (std_cxx11::shared_ptr::value_type> > data_, + initialize (std::shared_ptr::value_type> > data_, const std::vector &given_row_selection, const std::vector &given_column_selection) { @@ -1019,7 +1019,7 @@ namespace MatrixFreeOperators template void Base:: - initialize (std_cxx11::shared_ptr::value_type> > data_, + initialize (std::shared_ptr::value_type> > data_, const MGConstrainedDoFs &mg_constrained_dofs, const unsigned int level, const std::vector &given_row_selection) @@ -1033,7 +1033,7 @@ namespace MatrixFreeOperators template void Base:: - initialize (std_cxx11::shared_ptr > data_, + initialize (std::shared_ptr > data_, const std::vector &mg_constrained_dofs, const unsigned int level, const std::vector &given_row_selection) @@ -1354,7 +1354,7 @@ namespace MatrixFreeOperators template - std_cxx11::shared_ptr::value_type> > + std::shared_ptr::value_type> > Base::get_matrix_free() const { return data; @@ -1363,7 +1363,7 @@ namespace MatrixFreeOperators template - const std_cxx11::shared_ptr > & + const std::shared_ptr > & Base::get_matrix_diagonal_inverse() const { Assert(inverse_diagonal_entries.get() != NULL && @@ -1572,7 +1572,7 @@ namespace MatrixFreeOperators template void LaplaceOperator:: - set_coefficient(const std_cxx11::shared_ptr::value_type> > > &scalar_coefficient_ ) + set_coefficient(const std::shared_ptr::value_type> > > &scalar_coefficient_ ) { scalar_coefficient = scalar_coefficient_; } @@ -1580,7 +1580,7 @@ namespace MatrixFreeOperators template - std_cxx11::shared_ptr< Table<2, VectorizedArray< typename LaplaceOperator::value_type> > > + std::shared_ptr< Table<2, VectorizedArray< typename LaplaceOperator::value_type> > > LaplaceOperator:: get_coefficient() { diff --git a/include/deal.II/meshworker/dof_info.h b/include/deal.II/meshworker/dof_info.h index 5623816444..13021b8aaf 100644 --- a/include/deal.II/meshworker/dof_info.h +++ b/include/deal.II/meshworker/dof_info.h @@ -19,12 +19,13 @@ #include #include -#include #include #include #include #include +#include + DEAL_II_NAMESPACE_OPEN namespace MeshWorker diff --git a/include/deal.II/meshworker/integration_info.h b/include/deal.II/meshworker/integration_info.h index 0953ba6913..2ef065480b 100644 --- a/include/deal.II/meshworker/integration_info.h +++ b/include/deal.II/meshworker/integration_info.h @@ -19,13 +19,14 @@ #include #include -#include #include #include #include #include #include +#include + DEAL_II_NAMESPACE_OPEN namespace MeshWorker @@ -74,7 +75,7 @@ namespace MeshWorker { private: /// vector of FEValues objects - std::vector > > fevalv; + std::vector > > fevalv; public: static const unsigned int dimension = dim; static const unsigned int space_dimension = spacedim; @@ -117,7 +118,7 @@ namespace MeshWorker /** * Initialize the data vector and cache the selector. */ - void initialize_data(const std_cxx11::shared_ptr > &data); + void initialize_data(const std::shared_ptr > &data); /** * Delete the data created by initialize(). @@ -194,7 +195,7 @@ namespace MeshWorker * The global data vector used to compute function values in quadrature * points. */ - std_cxx11::shared_ptr > global_data; + std::shared_ptr > global_data; /** * The memory used by this object. @@ -474,9 +475,9 @@ namespace MeshWorker */ MeshWorker::VectorSelector face_selector; - std_cxx11::shared_ptr > cell_data; - std_cxx11::shared_ptr > boundary_data; - std_cxx11::shared_ptr > face_data; + std::shared_ptr > cell_data; + std::shared_ptr > boundary_data; + std::shared_ptr > face_data; /* @} */ /** @@ -556,7 +557,7 @@ namespace MeshWorker : fevalv(0), multigrid(false), - global_data(std_cxx11::shared_ptr >(new VectorDataBase)), + global_data(std::shared_ptr >(new VectorDataBase)), n_components(numbers::invalid_unsigned_int) {} @@ -582,14 +583,14 @@ namespace MeshWorker const FESubfaceValues *ps = dynamic_cast*>(&p); if (pc != 0) - fevalv[i] = std_cxx11::shared_ptr > ( + fevalv[i] = std::shared_ptr > ( new FEValues (pc->get_mapping(), pc->get_fe(), pc->get_quadrature(), pc->get_update_flags())); else if (pf != 0) - fevalv[i] = std_cxx11::shared_ptr > ( + fevalv[i] = std::shared_ptr > ( new FEFaceValues (pf->get_mapping(), pf->get_fe(), pf->get_quadrature(), pf->get_update_flags())); else if (ps != 0) - fevalv[i] = std_cxx11::shared_ptr > ( + fevalv[i] = std::shared_ptr > ( new FESubfaceValues (ps->get_mapping(), ps->get_fe(), ps->get_quadrature(), ps->get_update_flags())); else Assert(false, ExcInternalError()); @@ -612,7 +613,7 @@ namespace MeshWorker if (block_info == 0 || block_info->local().size() == 0) { fevalv.resize(1); - fevalv[0] = std_cxx11::shared_ptr > ( + fevalv[0] = std::shared_ptr > ( new FEVALUES (mapping, el, quadrature, flags)); } else @@ -620,7 +621,7 @@ namespace MeshWorker fevalv.resize(el.n_base_elements()); for (unsigned int i=0; i > ( + fevalv[i] = std::shared_ptr > ( new FEVALUES (mapping, el.base_element(i), quadrature, flags)); } } @@ -784,10 +785,10 @@ namespace MeshWorker const BlockInfo *block_info) { initialize(el, mapping, block_info); - std_cxx11::shared_ptr > p; + std::shared_ptr > p; VectorDataBase *pp; - p = std_cxx11::shared_ptr >(new VectorData (cell_selector)); + p = std::shared_ptr >(new VectorData (cell_selector)); // Public member function of parent class was not found without // explicit cast pp = &*p; @@ -795,13 +796,13 @@ namespace MeshWorker cell_data = p; cell.initialize_data(p); - p = std_cxx11::shared_ptr >(new VectorData (boundary_selector)); + p = std::shared_ptr >(new VectorData (boundary_selector)); pp = &*p; pp->initialize(data); boundary_data = p; boundary.initialize_data(p); - p = std_cxx11::shared_ptr >(new VectorData (face_selector)); + p = std::shared_ptr >(new VectorData (face_selector)); pp = &*p; pp->initialize(data); face_data = p; @@ -821,10 +822,10 @@ namespace MeshWorker const BlockInfo *block_info) { initialize(el, mapping, block_info); - std_cxx11::shared_ptr > p; + std::shared_ptr > p; VectorDataBase *pp; - p = std_cxx11::shared_ptr >(new MGVectorData (cell_selector)); + p = std::shared_ptr >(new MGVectorData (cell_selector)); // Public member function of parent class was not found without // explicit cast pp = &*p; @@ -832,13 +833,13 @@ namespace MeshWorker cell_data = p; cell.initialize_data(p); - p = std_cxx11::shared_ptr >(new MGVectorData (boundary_selector)); + p = std::shared_ptr >(new MGVectorData (boundary_selector)); pp = &*p; pp->initialize(data); boundary_data = p; boundary.initialize_data(p); - p = std_cxx11::shared_ptr >(new MGVectorData (face_selector)); + p = std::shared_ptr >(new MGVectorData (face_selector)); pp = &*p; pp->initialize(data); face_data = p; diff --git a/include/deal.II/meshworker/integration_info.templates.h b/include/deal.II/meshworker/integration_info.templates.h index 40f1877108..49338483e2 100644 --- a/include/deal.II/meshworker/integration_info.templates.h +++ b/include/deal.II/meshworker/integration_info.templates.h @@ -29,7 +29,7 @@ namespace MeshWorker template void IntegrationInfo::initialize_data( - const std_cxx11::shared_ptr > &data) + const std::shared_ptr > &data) { global_data = data; const unsigned int nqp = fevalv[0]->n_quadrature_points; diff --git a/include/deal.II/meshworker/local_integrator.h b/include/deal.II/meshworker/local_integrator.h index fcb0b5a9ee..0112d8f6e1 100644 --- a/include/deal.II/meshworker/local_integrator.h +++ b/include/deal.II/meshworker/local_integrator.h @@ -19,8 +19,8 @@ #include #include -#include +#include #include #include diff --git a/include/deal.II/meshworker/local_results.h b/include/deal.II/meshworker/local_results.h index 7242f9845e..d5c61833db 100644 --- a/include/deal.II/meshworker/local_results.h +++ b/include/deal.II/meshworker/local_results.h @@ -18,12 +18,13 @@ #define dealii__mesh_worker_local_results_h #include -#include #include #include #include #include +#include + DEAL_II_NAMESPACE_OPEN class BlockIndices; diff --git a/include/deal.II/meshworker/loop.h b/include/deal.II/meshworker/loop.h index f61db468b6..1421f113c5 100644 --- a/include/deal.II/meshworker/loop.h +++ b/include/deal.II/meshworker/loop.h @@ -18,7 +18,6 @@ #define dealii__mesh_worker_loop_h #include -#include #include #include #include @@ -27,6 +26,7 @@ #include #include +#include #define DEAL_II_MESHWORKER_PARALLEL 1 @@ -176,11 +176,11 @@ namespace MeshWorker ITERATOR cell, DoFInfoBox &dof_info, INFOBOX &info, - const std_cxx11::function &cell_worker, - const std_cxx11::function &boundary_worker, - const std_cxx11::function &face_worker, + const std::function &cell_worker, + const std::function &boundary_worker, + const std::function &face_worker, const LoopControl &loop_control) { const bool ignore_subdomain = (cell->get_triangulation().locally_owned_subdomain() @@ -384,11 +384,11 @@ namespace MeshWorker typename identity::type end, DOFINFO &dinfo, INFOBOX &info, - const std_cxx11::function &cell_worker, - const std_cxx11::function &boundary_worker, - const std_cxx11::function &face_worker, + const std::function &cell_worker, + const std::function &boundary_worker, + const std::function &face_worker, ASSEMBLER &assembler, const LoopControl &lctrl = LoopControl()) { @@ -404,10 +404,10 @@ namespace MeshWorker // Loop over all cells #ifdef DEAL_II_MESHWORKER_PARALLEL WorkStream::run(begin, end, - std_cxx11::bind(&cell_action, - std_cxx11::_1, std_cxx11::_3, std_cxx11::_2, - cell_worker, boundary_worker, face_worker, lctrl), - std_cxx11::bind(&internal::assemble, std_cxx11::_1, &assembler), + std::bind(&cell_action, + std::placeholders::_1, std::placeholders::_3, std::placeholders::_2, + cell_worker, boundary_worker, face_worker, lctrl), + std::bind(&internal::assemble, std::placeholders::_1, &assembler), info, dof_info); #else for (ITERATOR cell = begin; cell != end; ++cell) @@ -438,17 +438,17 @@ namespace MeshWorker ASSEMBLER &assembler, const LoopControl &lctrl = LoopControl()) { - std_cxx11::function&, IntegrationInfo&)> cell_worker; - std_cxx11::function&, IntegrationInfo&)> boundary_worker; - std_cxx11::function &, DoFInfo &, - IntegrationInfo &, - IntegrationInfo &)> face_worker; + std::function&, IntegrationInfo&)> cell_worker; + std::function&, IntegrationInfo&)> boundary_worker; + std::function &, DoFInfo &, + IntegrationInfo &, + IntegrationInfo &)> face_worker; if (integrator.use_cell) - cell_worker = std_cxx11::bind(&LocalIntegrator::cell, &integrator, std_cxx11::_1, std_cxx11::_2); + cell_worker = std::bind(&LocalIntegrator::cell, &integrator, std::placeholders::_1, std::placeholders::_2); if (integrator.use_boundary) - boundary_worker = std_cxx11::bind(&LocalIntegrator::boundary, &integrator, std_cxx11::_1, std_cxx11::_2); + boundary_worker = std::bind(&LocalIntegrator::boundary, &integrator, std::placeholders::_1, std::placeholders::_2); if (integrator.use_face) - face_worker = std_cxx11::bind(&LocalIntegrator::face, &integrator, std_cxx11::_1, std_cxx11::_2, std_cxx11::_3, std_cxx11::_4); + face_worker = std::bind(&LocalIntegrator::face, &integrator, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4); loop (begin, end, diff --git a/include/deal.II/multigrid/mg_matrix.h b/include/deal.II/multigrid/mg_matrix.h index d513186345..6c80f425e7 100644 --- a/include/deal.II/multigrid/mg_matrix.h +++ b/include/deal.II/multigrid/mg_matrix.h @@ -21,7 +21,8 @@ #include #include #include -#include + +#include DEAL_II_NAMESPACE_OPEN @@ -80,7 +81,7 @@ namespace mg */ std::size_t memory_consumption () const; private: - MGLevelObject > > matrices; + MGLevelObject > > matrices; }; } @@ -178,7 +179,7 @@ namespace mg { matrices.resize(p.min_level(), p.max_level()); for (unsigned int level=p.min_level(); level <= p.max_level(); ++level) - matrices[level] = std_cxx11::shared_ptr > + matrices[level] = std::shared_ptr > (new_pointer_matrix_base(p[level], VectorType())); } diff --git a/include/deal.II/multigrid/mg_transfer.h b/include/deal.II/multigrid/mg_transfer.h index 9d2c66bbce..b102d3fa46 100644 --- a/include/deal.II/multigrid/mg_transfer.h +++ b/include/deal.II/multigrid/mg_transfer.h @@ -33,7 +33,7 @@ #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -559,14 +559,14 @@ private: /** * Sparsity patterns for transfer matrices. */ - std::vector::Sparsity> > prolongation_sparsities; + std::vector::Sparsity> > prolongation_sparsities; /** * The actual prolongation matrix. column indices belong to the dof indices * of the mother cell, i.e. the coarse level. while row indices belong to * the child cell, i.e. the fine level. */ - std::vector::Matrix> > prolongation_matrices; + std::vector::Matrix> > prolongation_matrices; /** * Degrees of freedom on the refinement edge excluding those on the diff --git a/include/deal.II/multigrid/mg_transfer_block.h b/include/deal.II/multigrid/mg_transfer_block.h index c75c9db1df..677ed652df 100644 --- a/include/deal.II/multigrid/mg_transfer_block.h +++ b/include/deal.II/multigrid/mg_transfer_block.h @@ -32,7 +32,7 @@ #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -140,7 +140,7 @@ protected: DeclException0(ExcMatricesNotBuilt); private: - std::vector > prolongation_sparsities; + std::vector > prolongation_sparsities; protected: @@ -149,7 +149,7 @@ protected: * of the mother cell, i.e. the coarse level. while row indices belong to * the child cell, i.e. the fine level. */ - std::vector > > prolongation_matrices; + std::vector > > prolongation_matrices; /** * Mapping for the copy_to/from_mg-functions. The indices into this diff --git a/include/deal.II/multigrid/mg_transfer_component.h b/include/deal.II/multigrid/mg_transfer_component.h index 195bfe735f..1360369fcd 100644 --- a/include/deal.II/multigrid/mg_transfer_component.h +++ b/include/deal.II/multigrid/mg_transfer_component.h @@ -18,7 +18,6 @@ #include -#include #include #include #include @@ -30,6 +29,8 @@ #include #include +#include + DEAL_II_NAMESPACE_OPEN @@ -126,7 +127,7 @@ protected: DeclException0(ExcMatricesNotBuilt); private: - std::vector > prolongation_sparsities; + std::vector > prolongation_sparsities; protected: @@ -135,7 +136,7 @@ protected: * of the mother cell, i.e. the coarse level. while row indices belong to * the child cell, i.e. the fine level. */ - std::vector > > prolongation_matrices; + std::vector > > prolongation_matrices; /** * Holds the mapping for the copy_to/from_mg-functions. The data is diff --git a/include/deal.II/multigrid/sparse_matrix_collection.h b/include/deal.II/multigrid/sparse_matrix_collection.h index 63533b2b40..44302cbfa8 100644 --- a/include/deal.II/multigrid/sparse_matrix_collection.h +++ b/include/deal.II/multigrid/sparse_matrix_collection.h @@ -23,7 +23,8 @@ #include #include #include -#include + +#include DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/numerics/data_out.h b/include/deal.II/numerics/data_out.h index 85853f1d7e..150e6fe3cb 100644 --- a/include/deal.II/numerics/data_out.h +++ b/include/deal.II/numerics/data_out.h @@ -21,7 +21,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -41,7 +41,7 @@ namespace internal const unsigned int n_subdivisions, const std::vector &n_postprocessor_outputs, const Mapping &mapping, - const std::vector > > &finite_elements, + const std::vector > > &finite_elements, const UpdateFlags update_flags, const std::vector > &cell_to_patch_index_map); diff --git a/include/deal.II/numerics/data_out_dof_data.h b/include/deal.II/numerics/data_out_dof_data.h index c8c9aec2ee..04cc5217f5 100644 --- a/include/deal.II/numerics/data_out_dof_data.h +++ b/include/deal.II/numerics/data_out_dof_data.h @@ -31,7 +31,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -326,14 +326,14 @@ namespace internal const unsigned int n_subdivisions, const std::vector &n_postprocessor_outputs, const Mapping &mapping, - const std::vector > > &finite_elements, + const std::vector > > &finite_elements, const UpdateFlags update_flags, const bool use_face_values); ParallelDataBase (const ParallelDataBase &data); template - void reinit_all_fe_values(std::vector > > &dof_data, + void reinit_all_fe_values(std::vector > > &dof_data, const typename dealii::Triangulation::cell_iterator &cell, const unsigned int face = numbers::invalid_unsigned_int); @@ -350,11 +350,11 @@ namespace internal std::vector > > postprocessed_values; const dealii::hp::MappingCollection mapping_collection; - const std::vector > > finite_elements; + const std::vector > > finite_elements; const UpdateFlags update_flags; - std::vector > > x_fe_values; - std::vector > > x_fe_face_values; + std::vector > > x_fe_values; + std::vector > > x_fe_face_values; }; } } @@ -826,12 +826,12 @@ protected: /** * List of data elements with vectors of values for each degree of freedom. */ - std::vector > > dof_data; + std::vector > > dof_data; /** * List of data elements with vectors of values for each cell. */ - std::vector > > cell_data; + std::vector > > cell_data; /** * This is a list of patches that is created each time build_patches() is @@ -858,7 +858,7 @@ protected: * Extracts the finite elements stored in the dof_data object, including a * dummy object of FE_DGQ(0) in case only the triangulation is used. */ - std::vector > > + std::vector > > get_finite_elements() const; /** @@ -866,7 +866,7 @@ protected: * function. See there for a more extensive documentation. */ virtual - std::vector > + std::vector > get_vector_data_ranges () const; /** @@ -921,16 +921,16 @@ merge_patches (const DataOut_DoFData "as vectors.")); for (unsigned int i=0; i(get_vector_data_ranges()[i]) == - std_cxx11::get<0>(source.get_vector_data_ranges()[i]), + Assert (std::get<0>(get_vector_data_ranges()[i]) == + std::get<0>(source.get_vector_data_ranges()[i]), ExcMessage ("Both sources need to declare the same components " "as vectors.")); - Assert (std_cxx11::get<1>(get_vector_data_ranges()[i]) == - std_cxx11::get<1>(source.get_vector_data_ranges()[i]), + Assert (std::get<1>(get_vector_data_ranges()[i]) == + std::get<1>(source.get_vector_data_ranges()[i]), ExcMessage ("Both sources need to declare the same components " "as vectors.")); - Assert (std_cxx11::get<2>(get_vector_data_ranges()[i]) == - std_cxx11::get<2>(source.get_vector_data_ranges()[i]), + Assert (std::get<2>(get_vector_data_ranges()[i]) == + std::get<2>(source.get_vector_data_ranges()[i]), ExcMessage ("Both sources need to declare the same components " "as vectors.")); } diff --git a/include/deal.II/numerics/data_out_faces.h b/include/deal.II/numerics/data_out_faces.h index b89611b6ae..aa9d376674 100644 --- a/include/deal.II/numerics/data_out_faces.h +++ b/include/deal.II/numerics/data_out_faces.h @@ -42,7 +42,7 @@ namespace internal const unsigned int n_subdivisions, const std::vector &n_postprocessor_outputs, const Mapping &mapping, - const std::vector > > &finite_elements, + const std::vector > > &finite_elements, const UpdateFlags update_flags); std::vector > patch_evaluation_points; diff --git a/include/deal.II/numerics/data_out_rotation.h b/include/deal.II/numerics/data_out_rotation.h index af59da9966..b66ae10514 100644 --- a/include/deal.II/numerics/data_out_rotation.h +++ b/include/deal.II/numerics/data_out_rotation.h @@ -43,7 +43,7 @@ namespace internal const unsigned int n_patches_per_circle, const std::vector &n_postprocessor_outputs, const Mapping &mapping, - const std::vector > > &finite_elements, + const std::vector > > &finite_elements, const UpdateFlags update_flags); const unsigned int n_patches_per_circle; diff --git a/include/deal.II/numerics/derivative_approximation.h b/include/deal.II/numerics/derivative_approximation.h index d07b8b8b02..cfb392a51f 100644 --- a/include/deal.II/numerics/derivative_approximation.h +++ b/include/deal.II/numerics/derivative_approximation.h @@ -18,7 +18,6 @@ #include #include -#include #include #include #include diff --git a/include/deal.II/numerics/error_estimator.templates.h b/include/deal.II/numerics/error_estimator.templates.h index cbc9717e26..2634d2210f 100644 --- a/include/deal.II/numerics/error_estimator.templates.h +++ b/include/deal.II/numerics/error_estimator.templates.h @@ -44,12 +44,12 @@ #include #include -#include #include #include #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -1162,10 +1162,10 @@ estimate (const Mapping &mapping, // now let's work on all those cells: WorkStream::run (dof_handler.begin_active(), static_cast(dof_handler.end()), - std_cxx11::bind (&internal::estimate_one_cell, - std_cxx11::_1, std_cxx11::_2, std_cxx11::_3, std_cxx11::ref(solutions),strategy), - std_cxx11::bind (&internal::copy_local_to_global, - std_cxx11::_1, std_cxx11::ref(face_integrals)), + std::bind (&internal::estimate_one_cell, + std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::ref(solutions),strategy), + std::bind (&internal::copy_local_to_global, + std::placeholders::_1, std::ref(face_integrals)), parallel_data, sample_local_face_integrals); diff --git a/include/deal.II/numerics/matrix_creator.templates.h b/include/deal.II/numerics/matrix_creator.templates.h index 5f70ad3d76..8a6d279789 100644 --- a/include/deal.II/numerics/matrix_creator.templates.h +++ b/include/deal.II/numerics/matrix_creator.templates.h @@ -699,9 +699,9 @@ namespace MatrixCreator WorkStream::run (dof.begin_active(), static_cast::active_cell_iterator>(dof.end()), &MatrixCreator::internal::mass_assembler::active_cell_iterator,number>, - std_cxx11::bind (&MatrixCreator::internal:: - copy_local_to_global, Vector >, - std_cxx11::_1, &matrix, (Vector *)0), + std::bind (&MatrixCreator::internal:: + copy_local_to_global, Vector >, + std::placeholders::_1, &matrix, (Vector *)0), assembler_data, copy_data); } @@ -755,9 +755,9 @@ namespace MatrixCreator WorkStream::run (dof.begin_active(), static_cast::active_cell_iterator>(dof.end()), &MatrixCreator::internal::mass_assembler::active_cell_iterator,number>, - std_cxx11::bind(&MatrixCreator::internal:: - copy_local_to_global, Vector >, - std_cxx11::_1, &matrix, &rhs_vector), + std::bind(&MatrixCreator::internal:: + copy_local_to_global, Vector >, + std::placeholders::_1, &matrix, &rhs_vector), assembler_data, copy_data); } @@ -809,9 +809,9 @@ namespace MatrixCreator WorkStream::run (dof.begin_active(), static_cast::active_cell_iterator>(dof.end()), &MatrixCreator::internal::mass_assembler::active_cell_iterator,number>, - std_cxx11::bind (&MatrixCreator::internal:: - copy_local_to_global, Vector >, - std_cxx11::_1, &matrix, (Vector *)0), + std::bind (&MatrixCreator::internal:: + copy_local_to_global, Vector >, + std::placeholders::_1, &matrix, (Vector *)0), assembler_data, copy_data); } @@ -862,9 +862,9 @@ namespace MatrixCreator WorkStream::run (dof.begin_active(), static_cast::active_cell_iterator>(dof.end()), &MatrixCreator::internal::mass_assembler::active_cell_iterator,number>, - std_cxx11::bind (&MatrixCreator::internal:: - copy_local_to_global, Vector >, - std_cxx11::_1, &matrix, &rhs_vector), + std::bind (&MatrixCreator::internal:: + copy_local_to_global, Vector >, + std::placeholders::_1, &matrix, &rhs_vector), assembler_data, copy_data); } @@ -1237,22 +1237,22 @@ namespace MatrixCreator MatrixCreator::internal::AssemblerBoundary::CopyData,number > copy_data; WorkStream::run(dof.begin_active(),dof.end(), - static_cast::active_cell_iterator - const &,MatrixCreator::internal::AssemblerBoundary::Scratch const &, - MatrixCreator::internal::AssemblerBoundary::CopyData,number > &)> > - (std_cxx11::bind(&internal::create_boundary_mass_matrix_1,std_cxx11::_1,std_cxx11::_2, - std_cxx11::_3, - std_cxx11::cref(mapping),std_cxx11::cref(fe),std_cxx11::cref(q), - std_cxx11::cref(boundary_functions),coefficient, - std_cxx11::cref(component_mapping))), - static_cast,number> const &)> > (std_cxx11::bind( - &internal::copy_boundary_mass_matrix_1, - std_cxx11::_1, - std_cxx11::cref(boundary_functions), - std_cxx11::cref(dof_to_boundary_mapping), - std_cxx11::ref(matrix), - std_cxx11::ref(rhs_vector))), + static_cast::active_cell_iterator + const &,MatrixCreator::internal::AssemblerBoundary::Scratch const &, + MatrixCreator::internal::AssemblerBoundary::CopyData,number > &)> > + (std::bind(&internal::create_boundary_mass_matrix_1,std::placeholders::_1,std::placeholders::_2, + std::placeholders::_3, + std::cref(mapping),std::cref(fe),std::cref(q), + std::cref(boundary_functions),coefficient, + std::cref(component_mapping))), + static_cast,number> const &)> > (std::bind( + &internal::copy_boundary_mass_matrix_1, + std::placeholders::_1, + std::cref(boundary_functions), + std::cref(dof_to_boundary_mapping), + std::ref(matrix), + std::ref(rhs_vector))), scratch, copy_data); } @@ -1654,22 +1654,22 @@ namespace MatrixCreator MatrixCreator::internal::AssemblerBoundary::CopyData,number > copy_data; WorkStream::run(dof.begin_active(),dof.end(), - static_cast::active_cell_iterator - const &,MatrixCreator::internal::AssemblerBoundary::Scratch const &, - MatrixCreator::internal::AssemblerBoundary::CopyData,number > &)> > - (std_cxx11::bind( &create_hp_boundary_mass_matrix_1,std_cxx11::_1,std_cxx11::_2, - std_cxx11::_3, - std_cxx11::cref(mapping),std_cxx11::cref(fe_collection),std_cxx11::cref(q), - std_cxx11::cref(boundary_functions),coefficient, - std_cxx11::cref(component_mapping))), - static_cast,number > const &)> > ( - std_cxx11::bind( ©_hp_boundary_mass_matrix_1, - std_cxx11::_1, - std_cxx11::cref(boundary_functions), - std_cxx11::cref(dof_to_boundary_mapping), - std_cxx11::ref(matrix), - std_cxx11::ref(rhs_vector))), + static_cast::active_cell_iterator + const &,MatrixCreator::internal::AssemblerBoundary::Scratch const &, + MatrixCreator::internal::AssemblerBoundary::CopyData,number > &)> > + (std::bind( &create_hp_boundary_mass_matrix_1,std::placeholders::_1,std::placeholders::_2, + std::placeholders::_3, + std::cref(mapping),std::cref(fe_collection),std::cref(q), + std::cref(boundary_functions),coefficient, + std::cref(component_mapping))), + static_cast,number > const &)> > ( + std::bind( ©_hp_boundary_mass_matrix_1, + std::placeholders::_1, + std::cref(boundary_functions), + std::cref(dof_to_boundary_mapping), + std::ref(matrix), + std::ref(rhs_vector))), scratch, copy_data); } @@ -1725,11 +1725,11 @@ namespace MatrixCreator WorkStream::run (dof.begin_active(), static_cast::active_cell_iterator>(dof.end()), &MatrixCreator::internal::laplace_assembler::active_cell_iterator>, - std_cxx11::bind (&MatrixCreator::internal:: - copy_local_to_global, Vector >, - std_cxx11::_1, - &matrix, - (Vector *)NULL), + std::bind (&MatrixCreator::internal:: + copy_local_to_global, Vector >, + std::placeholders::_1, + &matrix, + (Vector *)NULL), assembler_data, copy_data); } @@ -1783,11 +1783,11 @@ namespace MatrixCreator WorkStream::run (dof.begin_active(), static_cast::active_cell_iterator>(dof.end()), &MatrixCreator::internal::laplace_assembler::active_cell_iterator>, - std_cxx11::bind (&MatrixCreator::internal:: - copy_local_to_global, Vector >, - std_cxx11::_1, - &matrix, - &rhs_vector), + std::bind (&MatrixCreator::internal:: + copy_local_to_global, Vector >, + std::placeholders::_1, + &matrix, + &rhs_vector), assembler_data, copy_data); } @@ -1838,11 +1838,11 @@ namespace MatrixCreator WorkStream::run (dof.begin_active(), static_cast::active_cell_iterator>(dof.end()), &MatrixCreator::internal::laplace_assembler::active_cell_iterator>, - std_cxx11::bind (&MatrixCreator::internal:: - copy_local_to_global, Vector >, - std_cxx11::_1, - &matrix, - (Vector *)0), + std::bind (&MatrixCreator::internal:: + copy_local_to_global, Vector >, + std::placeholders::_1, + &matrix, + (Vector *)0), assembler_data, copy_data); } @@ -1893,11 +1893,11 @@ namespace MatrixCreator WorkStream::run (dof.begin_active(), static_cast::active_cell_iterator>(dof.end()), &MatrixCreator::internal::laplace_assembler::active_cell_iterator>, - std_cxx11::bind (&MatrixCreator::internal:: - copy_local_to_global, Vector >, - std_cxx11::_1, - &matrix, - &rhs_vector), + std::bind (&MatrixCreator::internal:: + copy_local_to_global, Vector >, + std::placeholders::_1, + &matrix, + &rhs_vector), assembler_data, copy_data); } diff --git a/include/deal.II/numerics/time_dependent.h b/include/deal.II/numerics/time_dependent.h index 65489758d9..c9653f28d2 100644 --- a/include/deal.II/numerics/time_dependent.h +++ b/include/deal.II/numerics/time_dependent.h @@ -251,8 +251,8 @@ template class Triangulation; * void * TimeDependent::solve_primal_problem () * { - * do_loop (std_cxx11::bind(&TimeStepBase::init_for_primal_problem, std_cxx11::_1), - * std_cxx11::bind(&TimeStepBase::solve_primal_problem, std_cxx11::_1), + * do_loop (std::bind(&TimeStepBase::init_for_primal_problem, std::placeholders::_1), + * std::bind(&TimeStepBase::solve_primal_problem, std::placeholders::_1), * timestepping_data_primal, * forward); * }; @@ -273,7 +273,7 @@ template class Triangulation; * look-back and the last one denotes in which direction the loop is to be * run. * - * Using function pointers through the @p std_cxx11::bind functions provided by the + * Using function pointers through the @p std::bind functions provided by the * C++ standard library, it is possible to do neat tricks, like the * following, also taken from the wave program, in this case from the function * @p refine_grids: @@ -282,11 +282,11 @@ template class Triangulation; * compute the thresholds for refinement * ... * - * do_loop (std_cxx11::bind(&TimeStepBase_Tria::init_for_refinement, std_cxx11::_1), - * std_cxx11::bind(&TimeStepBase_Wave::refine_grid, - * std_cxx11::_1, - * TimeStepBase_Tria::RefinementData (top_threshold, - * bottom_threshold)), + * do_loop (std::bind(&TimeStepBase_Tria::init_for_refinement, std::placeholders::_1), + * std::bind(&TimeStepBase_Wave::refine_grid, + * std::placeholders::_1, + * TimeStepBase_Tria::RefinementData (top_threshold, + * bottom_threshold)), * TimeDependent::TimeSteppingData (0,1), * TimeDependent::forward); * @endcode @@ -519,8 +519,8 @@ public: * * To see how this function work, note that the function @p * solve_primal_problem only consists of a call to do_loop - * (std_cxx11::bind(&TimeStepBase::init_for_primal_problem, std_cxx11::_1), - * std_cxx11::bind(&TimeStepBase::solve_primal_problem, std_cxx11::_1), timestepping_data_primal, + * (std::bind(&TimeStepBase::init_for_primal_problem, std::placeholders::_1), + * std::bind(&TimeStepBase::solve_primal_problem, std::placeholders::_1), timestepping_data_primal, * forward);. * * Note also, that the given class from which the two functions are taken @@ -532,7 +532,7 @@ public: * the TimeStepBase class. * * Instead of using the above form, you can equally well use - * std_cxx11::bind(&X::unary_function, std_cxx11::_1, args...) which + * std::bind(&X::unary_function, std::placeholders::_1, args...) which * lets the @p do_loop function call the given function with the specified * parameters. */ diff --git a/include/deal.II/numerics/vector_tools.h b/include/deal.II/numerics/vector_tools.h index 090d875389..80f90256bb 100644 --- a/include/deal.II/numerics/vector_tools.h +++ b/include/deal.II/numerics/vector_tools.h @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -30,6 +29,7 @@ #include #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -894,7 +894,7 @@ namespace VectorTools const DoFHandler &dof, const ConstraintMatrix &constraints, const Quadrature &quadrature, - const std_cxx11::function< typename VectorType::value_type (const typename DoFHandler::active_cell_iterator &, const unsigned int)> func, + const std::function< typename VectorType::value_type (const typename DoFHandler::active_cell_iterator &, const unsigned int)> func, VectorType &vec_result); /** @@ -918,19 +918,19 @@ namespace VectorTools * which stores quadrature point data. */ template - void project (std_cxx11::shared_ptr > data, + void project (std::shared_ptr > data, const ConstraintMatrix &constraints, const unsigned int n_q_points_1d, - const std_cxx11::function< VectorizedArray (const unsigned int, const unsigned int)> func, + const std::function< VectorizedArray (const unsigned int, const unsigned int)> func, VectorType &vec_result); /** * Same as above but for n_q_points_1d = matrix_free.get_dof_handler().get_fe().degree+1. */ template - void project (std_cxx11::shared_ptr > data, + void project (std::shared_ptr > data, const ConstraintMatrix &constraints, - const std_cxx11::function< VectorizedArray (const unsigned int, const unsigned int)> func, + const std::function< VectorizedArray (const unsigned int, const unsigned int)> func, VectorType &vec_result); /** diff --git a/include/deal.II/numerics/vector_tools.templates.h b/include/deal.II/numerics/vector_tools.templates.h index 30e751f574..42c8f73f63 100644 --- a/include/deal.II/numerics/vector_tools.templates.h +++ b/include/deal.II/numerics/vector_tools.templates.h @@ -70,7 +70,7 @@ #include #include -#include +#include #include #include #include @@ -931,7 +931,7 @@ namespace VectorTools additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_color; additional_data.mapping_update_flags = (update_values | update_JxW_values); - std_cxx11::shared_ptr > matrix_free( + std::shared_ptr > matrix_free( new MatrixFree ()); matrix_free->reinit (mapping, dof, constraints, QGauss<1>(dof.get_fe().degree+2), additional_data); @@ -1146,7 +1146,7 @@ namespace VectorTools const DoFHandler &dof, const ConstraintMatrix &constraints, const Quadrature &quadrature, - const std_cxx11::function< typename VectorType::value_type (const typename DoFHandler::active_cell_iterator &, const unsigned int)> func, + const std::function< typename VectorType::value_type (const typename DoFHandler::active_cell_iterator &, const unsigned int)> func, VectorType &vec_result) { typedef typename VectorType::value_type Number; @@ -1164,7 +1164,7 @@ namespace VectorTools additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_color; additional_data.mapping_update_flags = (update_values | update_JxW_values); - std_cxx11::shared_ptr > matrix_free( + std::shared_ptr > matrix_free( new MatrixFree()); matrix_free->reinit (mapping, dof, constraints, QGauss<1>(dof.get_fe().degree+2), additional_data); @@ -1242,9 +1242,9 @@ namespace VectorTools template - void project_parallel (std_cxx11::shared_ptr > matrix_free, + void project_parallel (std::shared_ptr > matrix_free, const ConstraintMatrix &constraints, - const std_cxx11::function< VectorizedArray (const unsigned int, const unsigned int)> func, + const std::function< VectorizedArray (const unsigned int, const unsigned int)> func, VectorType &vec_result) { const DoFHandler &dof = matrix_free->get_dof_handler(); @@ -1322,7 +1322,7 @@ namespace VectorTools const DoFHandler &dof, const ConstraintMatrix &constraints, const Quadrature &quadrature, - const std_cxx11::function< typename VectorType::value_type (const typename DoFHandler::active_cell_iterator &, const unsigned int)> func, + const std::function< typename VectorType::value_type (const typename DoFHandler::active_cell_iterator &, const unsigned int)> func, VectorType &vec_result) { switch (dof.get_fe().degree) @@ -1344,10 +1344,10 @@ namespace VectorTools template - void project (std_cxx11::shared_ptr > matrix_free, + void project (std::shared_ptr > matrix_free, const ConstraintMatrix &constraints, const unsigned int n_q_points_1d, - const std_cxx11::function< VectorizedArray (const unsigned int, const unsigned int)> func, + const std::function< VectorizedArray (const unsigned int, const unsigned int)> func, VectorType &vec_result) { (void) n_q_points_1d; @@ -1375,9 +1375,9 @@ namespace VectorTools template - void project (std_cxx11::shared_ptr > matrix_free, + void project (std::shared_ptr > matrix_free, const ConstraintMatrix &constraints, - const std_cxx11::function< VectorizedArray (const unsigned int, const unsigned int)> func, + const std::function< VectorizedArray (const unsigned int, const unsigned int)> func, VectorType &vec_result) { project (matrix_free, @@ -6447,8 +6447,8 @@ namespace VectorTools template struct PointComparator { - bool operator ()(const std_cxx11::array &p1, - const std_cxx11::array &p2) + bool operator ()(const std::array &p1, + const std::array &p2) { for (unsigned int d=0; d, PointComparator > vector_dofs; + std::set, PointComparator > vector_dofs; std::vector face_dofs; - std::map, Vector > + std::map, Vector > dof_vector_to_b_values; std::set::iterator b_id; - std::vector > cell_vector_dofs; + std::vector > cell_vector_dofs; for (typename DoFHandlerType::active_cell_iterator cell = dof_handler.begin_active(); cell != dof_handler.end(); ++cell) if (!cell->is_artificial()) @@ -6602,7 +6602,7 @@ namespace VectorTools // iterate over the list of all vector components we found and see if we // can find constrained ones unsigned int n_total_constraints_found = 0; - for (typename std::set, + for (typename std::set, PointComparator >::const_iterator it=vector_dofs.begin(); it!=vector_dofs.end(); ++it) { diff --git a/include/deal.II/opencascade/boundary_lib.h b/include/deal.II/opencascade/boundary_lib.h index 77d0a83acb..753af53479 100644 --- a/include/deal.II/opencascade/boundary_lib.h +++ b/include/deal.II/opencascade/boundary_lib.h @@ -374,7 +374,7 @@ namespace OpenCASCADE * Return a tuple representing the minimum and maximum values of u * and v. Precisely, it returns (u_min, u_max, v_min, v_max) */ - std_cxx11::tuple + std::tuple get_uv_bounds() const; /** diff --git a/include/deal.II/opencascade/utilities.h b/include/deal.II/opencascade/utilities.h index 3d81aca296..cb6d71e71e 100644 --- a/include/deal.II/opencascade/utilities.h +++ b/include/deal.II/opencascade/utilities.h @@ -102,7 +102,7 @@ namespace OpenCASCADE * associated with actual geometries) which are contained in the given * shape. */ - std_cxx11::tuple + std::tuple count_elements(const TopoDS_Shape &shape); /** @@ -245,7 +245,7 @@ namespace OpenCASCADE * the u coordinate and the v coordinate (which is different from zero only * if the resulting shape is a face). */ - std_cxx11::tuple, TopoDS_Shape, double, double> + std::tuple, TopoDS_Shape, double, double> project_point_and_pull_back(const TopoDS_Shape &in_shape, const Point<3> &origin, const double tolerance=1e-7); @@ -278,7 +278,7 @@ namespace OpenCASCADE * face, returns the corresponding point in real space, the normal to the * surface at that point and the min and max curvatures as a tuple. */ - std_cxx11::tuple, Tensor<1,3>, double, double> + std::tuple, Tensor<1,3>, double, double> push_forward_and_differential_forms(const TopoDS_Face &face, const double u, const double v, @@ -292,7 +292,7 @@ namespace OpenCASCADE * and only the closest point is returned. This function will throw an * exception if the @p in_shape does not contain at least one face. */ - std_cxx11::tuple, Tensor<1,3>, double, double> + std::tuple, Tensor<1,3>, double, double> closest_point_and_differential_forms(const TopoDS_Shape &in_shape, const Point<3> &origin, const double tolerance=1e-7); diff --git a/source/base/data_out_base.cc b/source/base/data_out_base.cc index 812f066ae3..94fa6b06be 100644 --- a/source/base/data_out_base.cc +++ b/source/base/data_out_base.cc @@ -36,7 +36,6 @@ #include #include #include -#include #include #include @@ -47,6 +46,7 @@ #include #include #include +#include // we use uint32_t and uint8_t below, which are declared here: #include @@ -2555,7 +2555,7 @@ namespace DataOutBase template void write_ucd (const std::vector > &patches, const std::vector &data_names, - const std::vector > &, + const std::vector > &, const UcdFlags &flags, std::ostream &out) { @@ -2646,7 +2646,7 @@ namespace DataOutBase template void write_dx (const std::vector > &patches, const std::vector &data_names, - const std::vector > &, + const std::vector > &, const DXFlags &flags, std::ostream &out) { @@ -2937,7 +2937,7 @@ namespace DataOutBase template void write_gnuplot (const std::vector > &patches, const std::vector &data_names, - const std::vector > &, + const std::vector > &, const GnuplotFlags &flags, std::ostream &out) { @@ -3151,7 +3151,7 @@ namespace DataOutBase template void write_povray (const std::vector > &patches, const std::vector &data_names, - const std::vector > &, + const std::vector > &, const PovrayFlags &flags, std::ostream &out) { @@ -3508,7 +3508,7 @@ namespace DataOutBase template void write_eps (const std::vector > &/*patches*/, const std::vector &/*data_names*/, - const std::vector > &, + const std::vector > &, const EpsFlags &/*flags*/, std::ostream &/*out*/) { @@ -3520,7 +3520,7 @@ namespace DataOutBase template void write_eps (const std::vector > &patches, const std::vector &/*data_names*/, - const std::vector > &, + const std::vector > &, const EpsFlags &flags, std::ostream &out) { @@ -3889,7 +3889,7 @@ namespace DataOutBase template void write_gmv (const std::vector > &patches, const std::vector &data_names, - const std::vector > &, + const std::vector > &, const GmvFlags &flags, std::ostream &out) { @@ -4044,7 +4044,7 @@ namespace DataOutBase template void write_tecplot (const std::vector > &patches, const std::vector &data_names, - const std::vector > &, + const std::vector > &, const TecplotFlags &flags, std::ostream &out) { @@ -4287,7 +4287,7 @@ namespace DataOutBase template void write_tecplot_binary (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const TecplotFlags &flags, std::ostream &out) { @@ -4633,7 +4633,7 @@ namespace DataOutBase void write_vtk (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const VtkFlags &flags, std::ostream &out) { @@ -4798,21 +4798,21 @@ namespace DataOutBase std::vector data_set_written (n_data_sets, false); for (unsigned int n_th_vector=0; n_th_vector(vector_data_ranges[n_th_vector]) >= - std_cxx11::get<0>(vector_data_ranges[n_th_vector]), - ExcLowerRange (std_cxx11::get<1>(vector_data_ranges[n_th_vector]), - std_cxx11::get<0>(vector_data_ranges[n_th_vector]))); - AssertThrow (std_cxx11::get<1>(vector_data_ranges[n_th_vector]) < n_data_sets, - ExcIndexRange (std_cxx11::get<1>(vector_data_ranges[n_th_vector]), + AssertThrow (std::get<1>(vector_data_ranges[n_th_vector]) >= + std::get<0>(vector_data_ranges[n_th_vector]), + ExcLowerRange (std::get<1>(vector_data_ranges[n_th_vector]), + std::get<0>(vector_data_ranges[n_th_vector]))); + AssertThrow (std::get<1>(vector_data_ranges[n_th_vector]) < n_data_sets, + ExcIndexRange (std::get<1>(vector_data_ranges[n_th_vector]), 0, n_data_sets)); - AssertThrow (std_cxx11::get<1>(vector_data_ranges[n_th_vector]) + 1 - - std_cxx11::get<0>(vector_data_ranges[n_th_vector]) <= 3, + AssertThrow (std::get<1>(vector_data_ranges[n_th_vector]) + 1 + - std::get<0>(vector_data_ranges[n_th_vector]) <= 3, ExcMessage ("Can't declare a vector with more than 3 components " "in VTK")); // mark these components as already written: - for (unsigned int i=std_cxx11::get<0>(vector_data_ranges[n_th_vector]); - i<=std_cxx11::get<1>(vector_data_ranges[n_th_vector]); + for (unsigned int i=std::get<0>(vector_data_ranges[n_th_vector]); + i<=std::get<1>(vector_data_ranges[n_th_vector]); ++i) data_set_written[i] = true; @@ -4823,15 +4823,15 @@ namespace DataOutBase // name has been specified out << "VECTORS "; - if (std_cxx11::get<2>(vector_data_ranges[n_th_vector]) != "") - out << std_cxx11::get<2>(vector_data_ranges[n_th_vector]); + if (std::get<2>(vector_data_ranges[n_th_vector]) != "") + out << std::get<2>(vector_data_ranges[n_th_vector]); else { - for (unsigned int i=std_cxx11::get<0>(vector_data_ranges[n_th_vector]); - i(vector_data_ranges[n_th_vector]); + for (unsigned int i=std::get<0>(vector_data_ranges[n_th_vector]); + i(vector_data_ranges[n_th_vector]); ++i) out << data_names[i] << "__"; - out << data_names[std_cxx11::get<1>(vector_data_ranges[n_th_vector])]; + out << data_names[std::get<1>(vector_data_ranges[n_th_vector])]; } out << " double" @@ -4842,20 +4842,20 @@ namespace DataOutBase // components for (unsigned int n=0; n(vector_data_ranges[n_th_vector]) - - std_cxx11::get<0>(vector_data_ranges[n_th_vector])) + switch (std::get<1>(vector_data_ranges[n_th_vector]) - + std::get<0>(vector_data_ranges[n_th_vector])) { case 0: - out << data_vectors(std_cxx11::get<0>(vector_data_ranges[n_th_vector]), n) << " 0 0" + out << data_vectors(std::get<0>(vector_data_ranges[n_th_vector]), n) << " 0 0" << '\n'; break; case 1: - out << data_vectors(std_cxx11::get<0>(vector_data_ranges[n_th_vector]), n) << ' '<< data_vectors(std_cxx11::get<0>(vector_data_ranges[n_th_vector])+1, n) << " 0" + out << data_vectors(std::get<0>(vector_data_ranges[n_th_vector]), n) << ' '<< data_vectors(std::get<0>(vector_data_ranges[n_th_vector])+1, n) << " 0" << '\n'; break; case 2: - out << data_vectors(std_cxx11::get<0>(vector_data_ranges[n_th_vector]), n) << ' '<< data_vectors(std_cxx11::get<0>(vector_data_ranges[n_th_vector])+1, n) << ' '<< data_vectors(std_cxx11::get<0>(vector_data_ranges[n_th_vector])+2, n) + out << data_vectors(std::get<0>(vector_data_ranges[n_th_vector]), n) << ' '<< data_vectors(std::get<0>(vector_data_ranges[n_th_vector])+1, n) << ' '<< data_vectors(std::get<0>(vector_data_ranges[n_th_vector])+2, n) << '\n'; break; @@ -4943,7 +4943,7 @@ namespace DataOutBase void write_vtu (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const VtkFlags &flags, std::ostream &out) { @@ -4958,7 +4958,7 @@ namespace DataOutBase template void write_vtu_main (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const VtkFlags &flags, std::ostream &out) { @@ -4995,8 +4995,8 @@ namespace DataOutBase { // mark these components as already // written: - for (unsigned int i=std_cxx11::get<0>(vector_data_ranges[n_th_vector]); - i<=std_cxx11::get<1>(vector_data_ranges[n_th_vector]); + for (unsigned int i=std::get<0>(vector_data_ranges[n_th_vector]); + i<=std::get<1>(vector_data_ranges[n_th_vector]); ++i) data_set_written[i] = true; @@ -5007,15 +5007,15 @@ namespace DataOutBase // name has been specified out << " (vector_data_ranges[n_th_vector]) != "") - out << std_cxx11::get<2>(vector_data_ranges[n_th_vector]); + if (std::get<2>(vector_data_ranges[n_th_vector]) != "") + out << std::get<2>(vector_data_ranges[n_th_vector]); else { - for (unsigned int i=std_cxx11::get<0>(vector_data_ranges[n_th_vector]); - i(vector_data_ranges[n_th_vector]); + for (unsigned int i=std::get<0>(vector_data_ranges[n_th_vector]); + i(vector_data_ranges[n_th_vector]); ++i) out << data_names[i] << "__"; - out << data_names[std_cxx11::get<1>(vector_data_ranges[n_th_vector])]; + out << data_names[std::get<1>(vector_data_ranges[n_th_vector])]; } out << "\" NumberOfComponents=\"3\">\n"; @@ -5212,22 +5212,22 @@ namespace DataOutBase std::vector data_set_written (n_data_sets, false); for (unsigned int n_th_vector=0; n_th_vector(vector_data_ranges[n_th_vector]) >= - std_cxx11::get<0>(vector_data_ranges[n_th_vector]), - ExcLowerRange (std_cxx11::get<1>(vector_data_ranges[n_th_vector]), - std_cxx11::get<0>(vector_data_ranges[n_th_vector]))); - AssertThrow (std_cxx11::get<1>(vector_data_ranges[n_th_vector]) < n_data_sets, - ExcIndexRange (std_cxx11::get<1>(vector_data_ranges[n_th_vector]), + AssertThrow (std::get<1>(vector_data_ranges[n_th_vector]) >= + std::get<0>(vector_data_ranges[n_th_vector]), + ExcLowerRange (std::get<1>(vector_data_ranges[n_th_vector]), + std::get<0>(vector_data_ranges[n_th_vector]))); + AssertThrow (std::get<1>(vector_data_ranges[n_th_vector]) < n_data_sets, + ExcIndexRange (std::get<1>(vector_data_ranges[n_th_vector]), 0, n_data_sets)); - AssertThrow (std_cxx11::get<1>(vector_data_ranges[n_th_vector]) + 1 - - std_cxx11::get<0>(vector_data_ranges[n_th_vector]) <= 3, + AssertThrow (std::get<1>(vector_data_ranges[n_th_vector]) + 1 + - std::get<0>(vector_data_ranges[n_th_vector]) <= 3, ExcMessage ("Can't declare a vector with more than 3 components " "in VTK")); // mark these components as already // written: - for (unsigned int i=std_cxx11::get<0>(vector_data_ranges[n_th_vector]); - i<=std_cxx11::get<1>(vector_data_ranges[n_th_vector]); + for (unsigned int i=std::get<0>(vector_data_ranges[n_th_vector]); + i<=std::get<1>(vector_data_ranges[n_th_vector]); ++i) data_set_written[i] = true; @@ -5238,15 +5238,15 @@ namespace DataOutBase // name has been specified out << " (vector_data_ranges[n_th_vector]) != "") - out << std_cxx11::get<2>(vector_data_ranges[n_th_vector]); + if (std::get<2>(vector_data_ranges[n_th_vector]) != "") + out << std::get<2>(vector_data_ranges[n_th_vector]); else { - for (unsigned int i=std_cxx11::get<0>(vector_data_ranges[n_th_vector]); - i(vector_data_ranges[n_th_vector]); + for (unsigned int i=std::get<0>(vector_data_ranges[n_th_vector]); + i(vector_data_ranges[n_th_vector]); ++i) out << data_names[i] << "__"; - out << data_names[std_cxx11::get<1>(vector_data_ranges[n_th_vector])]; + out << data_names[std::get<1>(vector_data_ranges[n_th_vector])]; } out << "\" NumberOfComponents=\"3\" format=\"" @@ -5260,24 +5260,24 @@ namespace DataOutBase for (unsigned int n=0; n(vector_data_ranges[n_th_vector]) - - std_cxx11::get<0>(vector_data_ranges[n_th_vector])) + switch (std::get<1>(vector_data_ranges[n_th_vector]) - + std::get<0>(vector_data_ranges[n_th_vector])) { case 0: - data.push_back (data_vectors(std_cxx11::get<0>(vector_data_ranges[n_th_vector]), n)); + data.push_back (data_vectors(std::get<0>(vector_data_ranges[n_th_vector]), n)); data.push_back (0); data.push_back (0); break; case 1: - data.push_back (data_vectors(std_cxx11::get<0>(vector_data_ranges[n_th_vector]), n)); - data.push_back (data_vectors(std_cxx11::get<0>(vector_data_ranges[n_th_vector])+1, n)); + data.push_back (data_vectors(std::get<0>(vector_data_ranges[n_th_vector]), n)); + data.push_back (data_vectors(std::get<0>(vector_data_ranges[n_th_vector])+1, n)); data.push_back (0); break; case 2: - data.push_back (data_vectors(std_cxx11::get<0>(vector_data_ranges[n_th_vector]), n)); - data.push_back (data_vectors(std_cxx11::get<0>(vector_data_ranges[n_th_vector])+1, n)); - data.push_back (data_vectors(std_cxx11::get<0>(vector_data_ranges[n_th_vector])+2, n)); + data.push_back (data_vectors(std::get<0>(vector_data_ranges[n_th_vector]), n)); + data.push_back (data_vectors(std::get<0>(vector_data_ranges[n_th_vector])+1, n)); + data.push_back (data_vectors(std::get<0>(vector_data_ranges[n_th_vector])+2, n)); break; default: @@ -5328,7 +5328,7 @@ namespace DataOutBase write_pvtu_record (std::ostream &out, const std::vector &piece_names, const std::vector &data_names, - const std::vector > &vector_data_ranges) + const std::vector > &vector_data_ranges) { AssertThrow (out, ExcIO()); @@ -5351,22 +5351,22 @@ namespace DataOutBase std::vector data_set_written (n_data_sets, false); for (unsigned int n_th_vector=0; n_th_vector(vector_data_ranges[n_th_vector]) >= - std_cxx11::get<0>(vector_data_ranges[n_th_vector]), - ExcLowerRange (std_cxx11::get<1>(vector_data_ranges[n_th_vector]), - std_cxx11::get<0>(vector_data_ranges[n_th_vector]))); - AssertThrow (std_cxx11::get<1>(vector_data_ranges[n_th_vector]) < n_data_sets, - ExcIndexRange (std_cxx11::get<1>(vector_data_ranges[n_th_vector]), + AssertThrow (std::get<1>(vector_data_ranges[n_th_vector]) >= + std::get<0>(vector_data_ranges[n_th_vector]), + ExcLowerRange (std::get<1>(vector_data_ranges[n_th_vector]), + std::get<0>(vector_data_ranges[n_th_vector]))); + AssertThrow (std::get<1>(vector_data_ranges[n_th_vector]) < n_data_sets, + ExcIndexRange (std::get<1>(vector_data_ranges[n_th_vector]), 0, n_data_sets)); - AssertThrow (std_cxx11::get<1>(vector_data_ranges[n_th_vector]) + 1 - - std_cxx11::get<0>(vector_data_ranges[n_th_vector]) <= 3, + AssertThrow (std::get<1>(vector_data_ranges[n_th_vector]) + 1 + - std::get<0>(vector_data_ranges[n_th_vector]) <= 3, ExcMessage ("Can't declare a vector with more than 3 components " "in VTK")); // mark these components as already // written: - for (unsigned int i=std_cxx11::get<0>(vector_data_ranges[n_th_vector]); - i<=std_cxx11::get<1>(vector_data_ranges[n_th_vector]); + for (unsigned int i=std::get<0>(vector_data_ranges[n_th_vector]); + i<=std::get<1>(vector_data_ranges[n_th_vector]); ++i) data_set_written[i] = true; @@ -5377,15 +5377,15 @@ namespace DataOutBase // name has been specified out << " (vector_data_ranges[n_th_vector]) != "") - out << std_cxx11::get<2>(vector_data_ranges[n_th_vector]); + if (std::get<2>(vector_data_ranges[n_th_vector]) != "") + out << std::get<2>(vector_data_ranges[n_th_vector]); else { - for (unsigned int i=std_cxx11::get<0>(vector_data_ranges[n_th_vector]); - i(vector_data_ranges[n_th_vector]); + for (unsigned int i=std::get<0>(vector_data_ranges[n_th_vector]); + i(vector_data_ranges[n_th_vector]); ++i) out << data_names[i] << "__"; - out << data_names[std_cxx11::get<1>(vector_data_ranges[n_th_vector])]; + out << data_names[std::get<1>(vector_data_ranges[n_th_vector])]; } out << "\" NumberOfComponents=\"3\" format=\"ascii\"/>\n"; @@ -5526,7 +5526,7 @@ namespace DataOutBase template void write_svg (const std::vector > &, const std::vector &, - const std::vector > &, + const std::vector > &, const SvgFlags &, std::ostream &) { @@ -5536,7 +5536,7 @@ namespace DataOutBase template void write_svg (const std::vector > &patches, const std::vector &/*data_names*/, - const std::vector > &/*vector_data_ranges*/, + const std::vector > &/*vector_data_ranges*/, const SvgFlags &flags, std::ostream &out) { @@ -6175,7 +6175,7 @@ namespace DataOutBase void write_deal_II_intermediate (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const Deal_II_IntermediateFlags &/*flags*/, std::ostream &out) { @@ -6203,9 +6203,9 @@ namespace DataOutBase out << vector_data_ranges.size() << '\n'; for (unsigned int i=0; i(vector_data_ranges[i]) << ' ' - << std_cxx11::get<1>(vector_data_ranges[i]) << '\n' - << std_cxx11::get<2>(vector_data_ranges[i]) << '\n'; + out << std::get<0>(vector_data_ranges[i]) << ' ' + << std::get<1>(vector_data_ranges[i]) << '\n' + << std::get<2>(vector_data_ranges[i]) << '\n'; out << '\n'; // make sure everything now gets to @@ -6667,7 +6667,7 @@ write_filtered_data (DataOutBase::DataOutFilter &filtered_data) const template void DataOutBase::write_filtered_data (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, DataOutBase::DataOutFilter &filtered_data) { const unsigned int n_data_sets = data_names.size(); @@ -6714,35 +6714,35 @@ void DataOutBase::write_filtered_data (const std::vector > & for (n_th_vector=0,data_set=0; data_set(vector_data_ranges[n_th_vector]) < data_set) n_th_vector++; + while (n_th_vector < vector_data_ranges.size() && std::get<0>(vector_data_ranges[n_th_vector]) < data_set) n_th_vector++; // Determine the dimension of this data - if (n_th_vector < vector_data_ranges.size() && std_cxx11::get<0>(vector_data_ranges[n_th_vector]) == data_set) + if (n_th_vector < vector_data_ranges.size() && std::get<0>(vector_data_ranges[n_th_vector]) == data_set) { // Multiple dimensions - pt_data_vector_dim = std_cxx11::get<1>(vector_data_ranges[n_th_vector]) - std_cxx11::get<0>(vector_data_ranges[n_th_vector])+1; + pt_data_vector_dim = std::get<1>(vector_data_ranges[n_th_vector]) - std::get<0>(vector_data_ranges[n_th_vector])+1; // Ensure the dimensionality of the data is correct - AssertThrow (std_cxx11::get<1>(vector_data_ranges[n_th_vector]) >= std_cxx11::get<0>(vector_data_ranges[n_th_vector]), - ExcLowerRange (std_cxx11::get<1>(vector_data_ranges[n_th_vector]), std_cxx11::get<0>(vector_data_ranges[n_th_vector]))); - AssertThrow (std_cxx11::get<1>(vector_data_ranges[n_th_vector]) < n_data_sets, - ExcIndexRange (std_cxx11::get<1>(vector_data_ranges[n_th_vector]), 0, n_data_sets)); + AssertThrow (std::get<1>(vector_data_ranges[n_th_vector]) >= std::get<0>(vector_data_ranges[n_th_vector]), + ExcLowerRange (std::get<1>(vector_data_ranges[n_th_vector]), std::get<0>(vector_data_ranges[n_th_vector]))); + AssertThrow (std::get<1>(vector_data_ranges[n_th_vector]) < n_data_sets, + ExcIndexRange (std::get<1>(vector_data_ranges[n_th_vector]), 0, n_data_sets)); // Determine the vector name // Concatenate all the // component names with double // underscores unless a vector // name has been specified - if (std_cxx11::get<2>(vector_data_ranges[n_th_vector]) != "") + if (std::get<2>(vector_data_ranges[n_th_vector]) != "") { - vector_name = std_cxx11::get<2>(vector_data_ranges[n_th_vector]); + vector_name = std::get<2>(vector_data_ranges[n_th_vector]); } else { vector_name = ""; - for (i=std_cxx11::get<0>(vector_data_ranges[n_th_vector]); i(vector_data_ranges[n_th_vector]); ++i) + for (i=std::get<0>(vector_data_ranges[n_th_vector]); i(vector_data_ranges[n_th_vector]); ++i) vector_name += data_names[i] + "__"; - vector_name += data_names[std_cxx11::get<1>(vector_data_ranges[n_th_vector])]; + vector_name += data_names[std::get<1>(vector_data_ranges[n_th_vector])]; } } else @@ -7314,10 +7314,10 @@ DataOutInterface::memory_consumption () const template -std::vector > +std::vector > DataOutInterface::get_vector_data_ranges () const { - return std::vector >(); + return std::vector >(); } @@ -7332,7 +7332,7 @@ validate_dataset_names () const // complicated, because vector ranges might have a name or not. std::set all_names; - const std::vector > + const std::vector > ranges = this->get_vector_data_ranges(); const std::vector data_names = this->get_dataset_names(); const unsigned int n_data_sets = data_names.size(); @@ -7340,15 +7340,15 @@ validate_dataset_names () const for (unsigned int n_th_vector=0; n_th_vector(ranges[n_th_vector]); + const std::string &name = std::get<2>(ranges[n_th_vector]); if (name != "") { Assert(all_names.find(name) == all_names.end(), ExcMessage("Error: names of fields in DataOut need to be unique, " "but '" + name + "' is used more than once.")); all_names.insert(name); - for (unsigned int i=std_cxx11::get<0>(ranges[n_th_vector]); - i<=std_cxx11::get<1>(ranges[n_th_vector]); + for (unsigned int i=std::get<0>(ranges[n_th_vector]); + i<=std::get<1>(ranges[n_th_vector]); ++i) data_set_written[i] = true; } @@ -7388,7 +7388,7 @@ DataOutReader::read (std::istream &in) tmp.swap (dataset_names); } { - std::vector > tmp; + std::vector > tmp; tmp.swap (vector_data_ranges); } @@ -7463,8 +7463,8 @@ DataOutReader::read (std::istream &in) vector_data_ranges.resize (n_vector_data_ranges); for (unsigned int i=0; i> std_cxx11::get<0>(vector_data_ranges[i]) - >> std_cxx11::get<1>(vector_data_ranges[i]); + in >> std::get<0>(vector_data_ranges[i]) + >> std::get<1>(vector_data_ranges[i]); // read in the name of that vector // range. because it is on a separate @@ -7477,7 +7477,7 @@ DataOutReader::read (std::istream &in) std::string name; getline(in, name); getline(in, name); - std_cxx11::get<2>(vector_data_ranges[i]) = name; + std::get<2>(vector_data_ranges[i]) = name; } AssertThrow (in, ExcIO()); @@ -7509,16 +7509,16 @@ merge (const DataOutReader &source) "as vectors.")); for (unsigned int i=0; i(get_vector_data_ranges()[i]) == - std_cxx11::get<0>(source.get_vector_data_ranges()[i]), + Assert (std::get<0>(get_vector_data_ranges()[i]) == + std::get<0>(source.get_vector_data_ranges()[i]), ExcMessage ("Both sources need to declare the same components " "as vectors.")); - Assert (std_cxx11::get<1>(get_vector_data_ranges()[i]) == - std_cxx11::get<1>(source.get_vector_data_ranges()[i]), + Assert (std::get<1>(get_vector_data_ranges()[i]) == + std::get<1>(source.get_vector_data_ranges()[i]), ExcMessage ("Both sources need to declare the same components " "as vectors.")); - Assert (std_cxx11::get<2>(get_vector_data_ranges()[i]) == - std_cxx11::get<2>(source.get_vector_data_ranges()[i]), + Assert (std::get<2>(get_vector_data_ranges()[i]) == + std::get<2>(source.get_vector_data_ranges()[i]), ExcMessage ("Both sources need to declare the same components " "as vectors.")); } @@ -7572,7 +7572,7 @@ DataOutReader::get_dataset_names () const template -std::vector > +std::vector > DataOutReader::get_vector_data_ranges () const { return vector_data_ranges; diff --git a/source/base/data_out_base.inst.in b/source/base/data_out_base.inst.in index 3e80f337f0..6bc448402a 100644 --- a/source/base/data_out_base.inst.in +++ b/source/base/data_out_base.inst.in @@ -38,7 +38,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS void write_vtk (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const VtkFlags &flags, std::ostream &out); @@ -46,7 +46,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS void write_vtu (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const VtkFlags &flags, std::ostream &out); @@ -54,7 +54,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS void write_ucd (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const UcdFlags &flags, std::ostream &out); @@ -62,7 +62,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS void write_dx (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const DXFlags &flags, std::ostream &out); @@ -70,7 +70,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS void write_gnuplot (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const GnuplotFlags &flags, std::ostream &out); @@ -78,7 +78,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS void write_povray (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const PovrayFlags &flags, std::ostream &out); @@ -86,7 +86,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS void write_eps (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const EpsFlags &flags, std::ostream &out); @@ -94,7 +94,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS void write_gmv (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const GmvFlags &flags, std::ostream &out); @@ -102,7 +102,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS void write_tecplot (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const TecplotFlags &flags, std::ostream &out); @@ -110,7 +110,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS void write_tecplot_binary (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const TecplotFlags &flags, std::ostream &out); @@ -119,7 +119,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS void write_svg (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const SvgFlags &flags, std::ostream &out); #endif @@ -127,7 +127,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS void write_deal_II_intermediate (const std::vector > &patches, const std::vector &data_names, - const std::vector > &vector_data_ranges, + const std::vector > &vector_data_ranges, const Deal_II_IntermediateFlags &flags, std::ostream &out); \} diff --git a/source/base/function_lib.cc b/source/base/function_lib.cc index aabfd0be41..804cfbf817 100644 --- a/source/base/function_lib.cc +++ b/source/base/function_lib.cc @@ -2412,7 +2412,7 @@ namespace Functions template InterpolatedTensorProductGridData:: - InterpolatedTensorProductGridData(const std_cxx11::array,dim> &coordinate_values, + InterpolatedTensorProductGridData(const std::array,dim> &coordinate_values, const Table &data_values) : coordinate_values (coordinate_values), @@ -2525,8 +2525,8 @@ namespace Functions template InterpolatedUniformGridData:: - InterpolatedUniformGridData(const std_cxx11::array,dim> &interval_endpoints, - const std_cxx11::array &n_subintervals, + InterpolatedUniformGridData(const std::array,dim> &interval_endpoints, + const std::array &n_subintervals, const Table &data_values) : interval_endpoints (interval_endpoints), diff --git a/source/base/function_spherical.cc b/source/base/function_spherical.cc index be08727ef2..a5826cde3e 100644 --- a/source/base/function_spherical.cc +++ b/source/base/function_spherical.cc @@ -171,7 +171,7 @@ namespace Functions const unsigned int component) const { const Point p = p_ - coordinate_system_offset; - const std_cxx11::array sp = GeometricUtilities::Coordinates::to_spherical(p); + const std::array sp = GeometricUtilities::Coordinates::to_spherical(p); return svalue(sp, component); } @@ -183,8 +183,8 @@ namespace Functions const unsigned int component) const { const Point p = p_ - coordinate_system_offset; - const std_cxx11::array sp = GeometricUtilities::Coordinates::to_spherical(p); - const std_cxx11::array sg = sgradient(sp, component); + const std::array sp = GeometricUtilities::Coordinates::to_spherical(p); + const std::array sg = sgradient(sp, component); // somewhat backwards, but we need cos/sin's for unit vectors const double cos_theta = std::cos(sp[1]); @@ -229,9 +229,9 @@ namespace Functions const unsigned int component) const { const Point p = p_ - coordinate_system_offset; - const std_cxx11::array sp = GeometricUtilities::Coordinates::to_spherical(p); - const std_cxx11::array sg = sgradient(sp, component); - const std_cxx11::array sh = shessian(sp, component); + const std::array sp = GeometricUtilities::Coordinates::to_spherical(p); + const std::array sg = sgradient(sp, component); + const std::array sh = shessian(sp, component); // somewhat backwards, but we need cos/sin's for unit vectors const double cos_theta = std::cos(sp[1]); @@ -310,7 +310,7 @@ namespace Functions template double - Spherical::svalue(const std_cxx11::array & /* sp */, + Spherical::svalue(const std::array & /* sp */, const unsigned int /*component*/) const { AssertThrow(false, @@ -321,25 +321,25 @@ namespace Functions template - std_cxx11::array - Spherical::sgradient(const std_cxx11::array & /* sp */, + std::array + Spherical::sgradient(const std::array & /* sp */, const unsigned int /*component*/) const { AssertThrow(false, ExcNotImplemented()); - return std_cxx11::array(); + return std::array(); } template - std_cxx11::array - Spherical::shessian (const std_cxx11::array & /* sp */, + std::array + Spherical::shessian (const std::array & /* sp */, const unsigned int /*component*/) const { AssertThrow(false, ExcNotImplemented()); - return std_cxx11::array(); + return std::array(); } diff --git a/source/base/geometric_utilities.cc b/source/base/geometric_utilities.cc index 4f4e8d9dca..c90e33aa37 100644 --- a/source/base/geometric_utilities.cc +++ b/source/base/geometric_utilities.cc @@ -40,10 +40,10 @@ namespace GeometricUtilities template - std_cxx11::array + std::array to_spherical(const Point &position) { - std_cxx11::array scoord; + std::array scoord; // radius scoord[0] = position.norm(); @@ -67,7 +67,7 @@ namespace GeometricUtilities template Point - from_spherical(const std_cxx11::array &scoord) + from_spherical(const std::array &scoord) { Point ccoord; @@ -104,10 +104,10 @@ namespace GeometricUtilities } - template Point<2> from_spherical<2>(const std_cxx11::array &); - template Point<3> from_spherical<3>(const std_cxx11::array &); - template std_cxx11::array to_spherical<2>(const Point<2> &); - template std_cxx11::array to_spherical<3>(const Point<3> &); + template Point<2> from_spherical<2>(const std::array &); + template Point<3> from_spherical<3>(const std::array &); + template std::array to_spherical<2>(const Point<2> &); + template std::array to_spherical<3>(const Point<3> &); } } diff --git a/source/base/parameter_handler.cc b/source/base/parameter_handler.cc index bf4f0ed0b8..e1c6bfd40e 100644 --- a/source/base/parameter_handler.cc +++ b/source/base/parameter_handler.cc @@ -713,7 +713,7 @@ namespace Patterns std::string str; std::getline(is, str, '>'); - std_cxx11::shared_ptr base_pattern (pattern_factory(str)); + std::shared_ptr base_pattern (pattern_factory(str)); is.ignore(strlen(" of length ")); if (!(is >> min_elements)) @@ -932,8 +932,8 @@ namespace Patterns std::string value = str; value.erase (0, value.find(":")+1); - std_cxx11::shared_ptr key_pattern (pattern_factory(key)); - std_cxx11::shared_ptr value_pattern (pattern_factory(value)); + std::shared_ptr key_pattern (pattern_factory(key)); + std::shared_ptr value_pattern (pattern_factory(value)); is.ignore(strlen(" of length ")); if (!(is >> min_elements)) @@ -1832,7 +1832,7 @@ namespace read_xml_recursively (const boost::property_tree::ptree &source, const std::string ¤t_path, const char path_separator, - const std::vector > & + const std::vector > & patterns, boost::property_tree::ptree &destination) { @@ -2000,7 +2000,7 @@ ParameterHandler::declare_entry (const std::string &entry, // clone the pattern and store its // index in the node - patterns.push_back (std_cxx11::shared_ptr + patterns.push_back (std::shared_ptr (pattern.clone())); entries->put (get_current_full_path(entry) + path_separator + "pattern", static_cast(patterns.size()-1)); diff --git a/source/base/polynomial.cc b/source/base/polynomial.cc index 546fea9d0c..2ec390e1db 100644 --- a/source/base/polynomial.cc +++ b/source/base/polynomial.cc @@ -370,7 +370,7 @@ namespace Polynomials // need to transform p into standard form as // well if necessary. copy the polynomial to // do this - std_cxx11::shared_ptr > q_data; + std::shared_ptr > q_data; const Polynomial *q = 0; if (p.in_lagrange_product_form == true) { @@ -414,7 +414,7 @@ namespace Polynomials // need to transform p into standard form as // well if necessary. copy the polynomial to // do this - std_cxx11::shared_ptr > q_data; + std::shared_ptr > q_data; const Polynomial *q = 0; if (p.in_lagrange_product_form == true) { @@ -450,7 +450,7 @@ namespace Polynomials // need to transform p into standard form as // well if necessary. copy the polynomial to // do this - std_cxx11::shared_ptr > q_data; + std::shared_ptr > q_data; const Polynomial *q = 0; if (p.in_lagrange_product_form == true) { @@ -597,7 +597,7 @@ namespace Polynomials if (degree() == 0) return Monomial(0, 0.); - std_cxx11::shared_ptr > q_data; + std::shared_ptr > q_data; const Polynomial *q = 0; if (in_lagrange_product_form == true) { @@ -623,7 +623,7 @@ namespace Polynomials { // no simple form possible for Lagrange // polynomial on product form - std_cxx11::shared_ptr > q_data; + std::shared_ptr > q_data; const Polynomial *q = 0; if (in_lagrange_product_form == true) { @@ -973,7 +973,7 @@ namespace Polynomials // Reserve space for polynomials up to degree 19. Should be sufficient // for the start. - std::vector > > + std::vector > > Hierarchical::recursive_coefficients(20); @@ -1050,9 +1050,9 @@ namespace Polynomials // now make these arrays // const recursive_coefficients[0] = - std_cxx11::shared_ptr >(c0); + std::shared_ptr >(c0); recursive_coefficients[1] = - std_cxx11::shared_ptr >(c1); + std::shared_ptr >(c1); } else if (k==2) { @@ -1069,7 +1069,7 @@ namespace Polynomials (*c2)[2] = 4.*a; recursive_coefficients[2] = - std_cxx11::shared_ptr >(c2); + std::shared_ptr >(c2); } else { @@ -1113,7 +1113,7 @@ namespace Polynomials // const pointer in the // coefficients array recursive_coefficients[k] = - std_cxx11::shared_ptr >(ck); + std::shared_ptr >(ck); }; }; } diff --git a/source/base/quadrature_lib.cc b/source/base/quadrature_lib.cc index 0a1d7c505c..5b4eba3886 100644 --- a/source/base/quadrature_lib.cc +++ b/source/base/quadrature_lib.cc @@ -16,11 +16,10 @@ #include #include -#include - #include #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -935,10 +934,10 @@ QSorted::QSorted(const Quadrature &quad) : std::sort(permutation.begin(), permutation.end(), - std_cxx11::bind(&QSorted::compare_weights, - std_cxx11::ref(*this), - std_cxx11::_1, - std_cxx11::_2)); + std::bind(&QSorted::compare_weights, + std::ref(*this), + std::placeholders::_1, + std::placeholders::_2)); for (unsigned int i=0; i #include #include -#include + +#include DEAL_II_NAMESPACE_OPEN @@ -334,9 +335,9 @@ compute (const Point &p, // derivatives, up to the 4th derivative, for up to 20 polynomials). // If someone uses a larger number of // polynomials, we need to allocate more memory on the heap. - std_cxx11::array, dim> *v; - std_cxx11::array, dim>, 20> small_array; - std::vector, dim> > large_array; + std::array, dim> *v; + std::array, dim>, 20> small_array; + std::vector, dim> > large_array; const unsigned int n_polynomials = polynomials.size(); if (n_polynomials > 20) diff --git a/source/distributed/grid_refinement.cc b/source/distributed/grid_refinement.cc index 480d50afb0..da791ed39a 100644 --- a/source/distributed/grid_refinement.cc +++ b/source/distributed/grid_refinement.cc @@ -15,7 +15,6 @@ #include -#include #include #include #include @@ -35,6 +34,7 @@ #include #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -298,9 +298,9 @@ namespace unsigned int my_count = std::count_if (criteria.begin(), criteria.end(), - std_cxx11::bind (std::greater(), - std_cxx11::_1, - test_threshold)); + std::bind (std::greater(), + std::placeholders::_1, + test_threshold)); unsigned int total_count; ierr = MPI_Reduce (&my_count, &total_count, 1, MPI_UNSIGNED, diff --git a/source/distributed/shared_tria.cc b/source/distributed/shared_tria.cc index 2d27035f87..50fc14f7d4 100644 --- a/source/distributed/shared_tria.cc +++ b/source/distributed/shared_tria.cc @@ -59,7 +59,7 @@ namespace parallel { // get halo layer of (ghost) cells // parallel::shared::Triangulation:: - std_cxx11::function::active_cell_iterator &)> predicate + std::function::active_cell_iterator &)> predicate = IteratorFilters::SubdomainEqualTo(this->my_subdomain); const std::vector::active_cell_iterator> diff --git a/source/distributed/solution_transfer.cc b/source/distributed/solution_transfer.cc index 5c05da9303..99b9628a0f 100644 --- a/source/distributed/solution_transfer.cc +++ b/source/distributed/solution_transfer.cc @@ -34,7 +34,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -88,12 +88,12 @@ namespace parallel offset = tria->register_data_attach(size, - std_cxx11::bind(&SolutionTransfer::pack_callback, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3)); + std::bind(&SolutionTransfer::pack_callback, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3)); } @@ -168,13 +168,13 @@ namespace parallel Assert (tria != 0, ExcInternalError()); tria->notify_ready_to_unpack(offset, - std_cxx11::bind(&SolutionTransfer::unpack_callback, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3, - std_cxx11::ref(all_out))); + std::bind(&SolutionTransfer::unpack_callback, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3, + std::ref(all_out))); for (typename std::vector::iterator it=all_out.begin(); diff --git a/source/distributed/tria.cc b/source/distributed/tria.cc index 42dce645f6..ebb8cab5cb 100644 --- a/source/distributed/tria.cc +++ b/source/distributed/tria.cc @@ -555,13 +555,13 @@ namespace attach_mesh_data_recursively (const typename internal::p4est::types::tree &tree, const typename Triangulation::cell_iterator &dealii_cell, const typename internal::p4est::types::quadrant &p4est_cell, - const typename std::list::cell_iterator, typename parallel::distributed::Triangulation::CellStatus, void *) > > > &attached_data_pack_callbacks) { - typedef std::list::cell_iterator, typename parallel::distributed::Triangulation::CellStatus, void *) @@ -796,7 +796,7 @@ namespace const typename Triangulation::cell_iterator &parent_cell, const typename internal::p4est::types::quadrant &p4est_cell, const unsigned int offset, - const typename std_cxx11::function< + const typename std::function< void(typename parallel::distributed::Triangulation::cell_iterator, typename parallel::distributed::Triangulation::CellStatus, void *) > &unpack_callback) { @@ -3275,9 +3275,9 @@ namespace parallel unsigned int Triangulation:: register_data_attach (const std::size_t size, - const std_cxx11::function &pack_callback) + const std::function &pack_callback) { Assert(size>0, ExcMessage("register_data_attach(), size==0")); Assert(attached_data_pack_callbacks.size()==n_attached_datas, @@ -3298,9 +3298,9 @@ namespace parallel void Triangulation:: notify_ready_to_unpack (const unsigned int offset, - const std_cxx11::function &unpack_callback) + const std::function &unpack_callback) { Assert (offset >= sizeof(CellStatus), ExcMessage ("invalid offset in notify_ready_to_unpack()")); diff --git a/source/dofs/dof_tools.cc b/source/dofs/dof_tools.cc index 3475ddf8da..19314c16c1 100644 --- a/source/dofs/dof_tools.cc +++ b/source/dofs/dof_tools.cc @@ -1270,7 +1270,7 @@ namespace DoFTools subdomain_id < n_subdomains; ++subdomain_id) { // Extract the layer of cells around this subdomain - std_cxx11::function predicate + std::function predicate = IteratorFilters::SubdomainEqualTo(subdomain_id); const std::vector active_halo_layer = GridTools::compute_active_cell_halo_layer (dof_handler, diff --git a/source/dofs/dof_tools_constraints.cc b/source/dofs/dof_tools_constraints.cc index 07c8ecbd05..2960525c8c 100644 --- a/source/dofs/dof_tools_constraints.cc +++ b/source/dofs/dof_tools_constraints.cc @@ -13,7 +13,6 @@ // // --------------------------------------------------------------------- -#include #include #include #include @@ -39,6 +38,7 @@ #endif #include +#include #include DEAL_II_NAMESPACE_OPEN @@ -308,11 +308,11 @@ namespace DoFTools ensure_existence_of_master_dof_mask (const FiniteElement &fe1, const FiniteElement &fe2, const FullMatrix &face_interpolation_matrix, - std_cxx11::shared_ptr > &master_dof_mask) + std::shared_ptr > &master_dof_mask) { - if (master_dof_mask == std_cxx11::shared_ptr >()) + if (master_dof_mask == std::shared_ptr >()) { - master_dof_mask = std_cxx11::shared_ptr > + master_dof_mask = std::shared_ptr > (new std::vector (fe1.dofs_per_face)); select_master_dofs_for_face_restriction (fe1, fe2, @@ -333,11 +333,11 @@ namespace DoFTools void ensure_existence_of_face_matrix (const FiniteElement &fe1, const FiniteElement &fe2, - std_cxx11::shared_ptr > &matrix) + std::shared_ptr > &matrix) { - if (matrix == std_cxx11::shared_ptr >()) + if (matrix == std::shared_ptr >()) { - matrix = std_cxx11::shared_ptr > + matrix = std::shared_ptr > (new FullMatrix (fe2.dofs_per_face, fe1.dofs_per_face)); fe1.get_face_interpolation_matrix (fe2, @@ -355,11 +355,11 @@ namespace DoFTools ensure_existence_of_subface_matrix (const FiniteElement &fe1, const FiniteElement &fe2, const unsigned int subface, - std_cxx11::shared_ptr > &matrix) + std::shared_ptr > &matrix) { - if (matrix == std_cxx11::shared_ptr >()) + if (matrix == std::shared_ptr >()) { - matrix = std_cxx11::shared_ptr > + matrix = std::shared_ptr > (new FullMatrix (fe2.dofs_per_face, fe1.dofs_per_face)); fe1.get_subface_interpolation_matrix (fe2, @@ -378,7 +378,7 @@ namespace DoFTools void ensure_existence_of_split_face_matrix (const FullMatrix &face_interpolation_matrix, const std::vector &master_dof_mask, - std_cxx11::shared_ptr,FullMatrix > > &split_matrix) + std::shared_ptr,FullMatrix > > &split_matrix) { AssertDimension (master_dof_mask.size(), face_interpolation_matrix.m()); Assert (std::count (master_dof_mask.begin(), master_dof_mask.end(), true) == @@ -386,10 +386,10 @@ namespace DoFTools ExcInternalError()); if (split_matrix == - std_cxx11::shared_ptr,FullMatrix > >()) + std::shared_ptr,FullMatrix > >()) { split_matrix - = std_cxx11::shared_ptr,FullMatrix > > + = std::shared_ptr,FullMatrix > > (new std::pair,FullMatrix >()); const unsigned int n_master_dofs = face_interpolation_matrix.n(); @@ -1075,10 +1075,10 @@ namespace DoFTools // different (or the same) finite elements. we compute them only // once, namely the first time they are needed, and then just reuse // them - Table<2,std_cxx11::shared_ptr > > + Table<2,std::shared_ptr > > face_interpolation_matrices (n_finite_elements (dof_handler), n_finite_elements (dof_handler)); - Table<3,std_cxx11::shared_ptr > > + Table<3,std::shared_ptr > > subface_interpolation_matrices (n_finite_elements (dof_handler), n_finite_elements (dof_handler), GeometryInfo::max_children_per_face); @@ -1087,14 +1087,14 @@ namespace DoFTools // master and slave parts, and for which the master part is inverted. // these two matrices are derived from the face interpolation matrix // as described in the @ref hp_paper "hp paper" - Table<2,std_cxx11::shared_ptr,FullMatrix > > > + Table<2,std::shared_ptr,FullMatrix > > > split_face_interpolation_matrices (n_finite_elements (dof_handler), n_finite_elements (dof_handler)); // finally, for each pair of finite elements, have a mask that states // which of the degrees of freedom on the coarse side of a refined // face will act as master dofs. - Table<2,std_cxx11::shared_ptr > > + Table<2,std::shared_ptr > > master_dof_masks (n_finite_elements (dof_handler), n_finite_elements (dof_handler)); @@ -2099,7 +2099,7 @@ namespace DoFTools // have an array that stores the location of each vector-dof tuple // we want to rotate. - typedef std_cxx1x::array DoFTuple; + typedef std::array DoFTuple; // start with a pristine interpolation matrix... FullMatrix transformation = IdentityMatrix(n_dofs_per_face); @@ -2738,21 +2738,21 @@ namespace DoFTools WorkStream::run(coarse_grid.begin_active(), coarse_grid.end(), - std_cxx11::bind(&compute_intergrid_weights_3, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3, - coarse_component, - std_cxx11::cref(coarse_grid.get_fe()), - std_cxx11::cref(coarse_to_fine_grid_map), - std_cxx11::cref(parameter_dofs)), - std_cxx11::bind(©_intergrid_weights_3, - std_cxx11::_1, - coarse_component, - std_cxx11::cref(coarse_grid.get_fe()), - std_cxx11::cref(weight_mapping), - is_called_in_parallel, - std_cxx11::ref(weights)), + std::bind(&compute_intergrid_weights_3, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3, + coarse_component, + std::cref(coarse_grid.get_fe()), + std::cref(coarse_to_fine_grid_map), + std::cref(parameter_dofs)), + std::bind(©_intergrid_weights_3, + std::placeholders::_1, + coarse_component, + std::cref(coarse_grid.get_fe()), + std::cref(weight_mapping), + is_called_in_parallel, + std::ref(weights)), scratch, copy_data); @@ -3199,7 +3199,7 @@ namespace DoFTools // now compute the requested representation const types::global_dof_index n_global_parm_dofs = std::count_if (weight_mapping.begin(), weight_mapping.end(), - std_cxx11::bind (std::not_equal_to(), std_cxx11::_1, numbers::invalid_dof_index)); + std::bind (std::not_equal_to(), std::placeholders::_1, numbers::invalid_dof_index)); // first construct the inverse mapping of weight_mapping std::vector inverse_weight_mapping (n_global_parm_dofs, diff --git a/source/fe/fe.cc b/source/fe/fe.cc index 07fafdf73a..6b2bdd88a5 100644 --- a/source/fe/fe.cc +++ b/source/fe/fe.cc @@ -88,9 +88,9 @@ FiniteElement (const FiniteElementData &fe_data, n_nonzero_components_table (compute_n_nonzero_components(nonzero_components)), cached_primitivity (std::find_if (n_nonzero_components_table.begin(), n_nonzero_components_table.end(), - std_cxx11::bind (std::not_equal_to(), - std_cxx11::_1, - 1U)) + std::bind (std::not_equal_to(), + std::placeholders::_1, + 1U)) == n_nonzero_components_table.end()) { Assert (restriction_is_additive_flags.size() == this->dofs_per_cell, diff --git a/source/fe/fe_p1nc.cc b/source/fe/fe_p1nc.cc index 43753aaf14..b2e10eab29 100644 --- a/source/fe/fe_p1nc.cc +++ b/source/fe/fe_p1nc.cc @@ -87,7 +87,7 @@ FE_P1NC::get_dpo_vector () -std_cxx11::array,4> +std::array,4> FE_P1NC::get_linear_shape_coefficients (const Triangulation<2,2>::cell_iterator &cell) { // edge midpoints @@ -105,7 +105,7 @@ FE_P1NC::get_linear_shape_coefficients (const Triangulation<2,2>::cell_iterator const double det = (mpt[0](0)-mpt[1](0))*(mpt[2](1)-mpt[3](1)) - (mpt[2](0)-mpt[3](0))*(mpt[0](1)-mpt[1](1)); - std_cxx11::array,4> coeffs; + std::array,4> coeffs; coeffs[0][0] = ((mpt[2](1)-mpt[3](1))*(0.5) -(mpt[0](1)-mpt[1](1))*(0.5))/det; coeffs[1][0] = ((mpt[2](1)-mpt[3](1))*(-0.5) -(mpt[0](1)-mpt[1](1))*(0.5))/det; coeffs[2][0] = ((mpt[2](1)-mpt[3](1))*(0.5) -(mpt[0](1)-mpt[1](1))*(-0.5))/det; @@ -207,7 +207,7 @@ FE_P1NC::fill_fe_values (const Triangulation<2,2>::cell_iterator &cell const unsigned int n_q_points = mapping_data.quadrature_points.size(); // linear shape functions - std_cxx11::array,4> coeffs = get_linear_shape_coefficients (cell); + std::array,4> coeffs = get_linear_shape_coefficients (cell); // compute on the cell if (flags & update_values) @@ -239,7 +239,7 @@ FE_P1NC::fill_fe_face_values (const Triangulation<2,2>::cell_iterator const UpdateFlags flags(fe_internal.update_each); // linear shape functions - const std_cxx11::array,4> coeffs + const std::array,4> coeffs = get_linear_shape_coefficients (cell); // compute on the face @@ -280,7 +280,7 @@ FE_P1NC::fill_fe_subface_values (const Triangulation<2,2>::cell_iterator const UpdateFlags flags(fe_internal.update_each); // linear shape functions - const std_cxx11::array,4> coeffs + const std::array,4> coeffs = get_linear_shape_coefficients (cell); // compute on the subface diff --git a/source/fe/fe_q_bubbles.cc b/source/fe/fe_q_bubbles.cc index ffd47d35b7..da85d736f2 100644 --- a/source/fe/fe_q_bubbles.cc +++ b/source/fe/fe_q_bubbles.cc @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -33,6 +32,7 @@ #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -52,7 +52,7 @@ namespace FE_Q_Bubbles_Helper const unsigned int degree = fe.degree; // Initialize quadrature formula on fine cells - std_cxx11::unique_ptr > q_fine; + std::unique_ptr > q_fine; Quadrature<1> q_dummy(std::vector >(1), std::vector (1,1.)); switch (dim) { diff --git a/source/fe/fe_system.cc b/source/fe/fe_system.cc index f88f90ffa4..f0697dd447 100644 --- a/source/fe/fe_system.cc +++ b/source/fe/fe_system.cc @@ -1481,7 +1481,7 @@ void FESystem::initialize (const std::vector0) { base_elements[ind] = - std::make_pair (std_cxx11::shared_ptr > + std::make_pair (std::shared_ptr > (clone_base_elements[ind].return_value()), multiplicities[i]); ++ind; diff --git a/source/fe/fe_tools.cc b/source/fe/fe_tools.cc index 20e2587b04..c9344e3fd3 100644 --- a/source/fe/fe_tools.cc +++ b/source/fe/fe_tools.cc @@ -53,12 +53,12 @@ #include #include -#include #include #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -1061,9 +1061,9 @@ namespace template void - fill_no_codim_fe_names (std::map > &result) + fill_no_codim_fe_names (std::map > &result) { - typedef std_cxx11::shared_ptr FEFactoryPointer; + typedef std::shared_ptr FEFactoryPointer; result["FE_Q_Hierarchical"] = FEFactoryPointer(new FETools::FEFactory >); @@ -1124,9 +1124,9 @@ namespace // nonzero codimension. template void - fill_codim_fe_names (std::map > &result) + fill_codim_fe_names (std::map > &result) { - typedef std_cxx11::shared_ptr FEFactoryPointer; + typedef std::shared_ptr FEFactoryPointer; result["FE_Bernstein"] = FEFactoryPointer(new FETools::FEFactory >); @@ -1160,12 +1160,12 @@ namespace // by the functions above. std::vector > > > + std::shared_ptr > > > fill_default_map() { std::vector > > > + std::shared_ptr > > > result(4); for (unsigned int d=0; d<4; ++d) @@ -1217,7 +1217,7 @@ namespace static std::vector > > > + std::shared_ptr > > > fe_name_map = fill_default_map(); } @@ -2303,7 +2303,7 @@ namespace FETools // Insert the normalized name into // the map fe_name_map[dim][spacedim][name] = - std_cxx11::shared_ptr (factory); + std::shared_ptr (factory); } @@ -2319,7 +2319,7 @@ namespace FETools FiniteElement * get_fe_by_name_ext (std::string &name, const std::map > + std::shared_ptr > &fe_name_map) { // Extract the name of the diff --git a/source/fe/fe_tools_interpolate.cc b/source/fe/fe_tools_interpolate.cc index 15f3e920d3..7f5f1fd6dc 100644 --- a/source/fe/fe_tools_interpolate.cc +++ b/source/fe/fe_tools_interpolate.cc @@ -40,11 +40,11 @@ #include #include -#include #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -113,7 +113,7 @@ namespace FETools // that memory is released again std::map *, std::map *, - std_cxx11::shared_ptr > > > + std::shared_ptr > > > interpolation_matrices; typename DoFHandlerType1::active_cell_iterator cell1 = dof1.begin_active(), @@ -174,7 +174,7 @@ namespace FETools // there if (interpolation_matrices[&cell1->get_fe()][&cell2->get_fe()].get() == 0) { - std_cxx11::shared_ptr > + std::shared_ptr > interpolation_matrix (new FullMatrix (dofs_per_cell2, dofs_per_cell1)); interpolation_matrices[&cell1->get_fe()][&cell2->get_fe()] @@ -278,7 +278,7 @@ namespace FETools // dof1 to the back_interpolation // matrices std::map *, - std_cxx11::shared_ptr > > interpolation_matrices; + std::shared_ptr > > interpolation_matrices; for (; cell!=endc; ++cell) if ((cell->subdomain_id() == subdomain_id) @@ -308,7 +308,7 @@ namespace FETools if (interpolation_matrices[&cell->get_fe()] == 0) { interpolation_matrices[&cell->get_fe()] = - std_cxx11::shared_ptr > + std::shared_ptr > (new FullMatrix(dofs_per_cell1, dofs_per_cell1)); get_back_interpolation_matrix(cell->get_fe(), fe2, *interpolation_matrices[&cell->get_fe()]); diff --git a/source/fe/fe_values.cc b/source/fe/fe_values.cc index 964b81365f..6255057241 100644 --- a/source/fe/fe_values.cc +++ b/source/fe/fe_values.cc @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -36,6 +35,7 @@ #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -3484,12 +3484,12 @@ maybe_invalidate_previous_present_cell (const typename Triangulationget_triangulation().signals.any_change.connect - (std_cxx11::bind (&FEValuesBase::invalidate_present_cell, - std_cxx11::ref(static_cast&>(*this)))); + (std::bind (&FEValuesBase::invalidate_present_cell, + std::ref(static_cast&>(*this)))); tria_listener_mesh_transform = cell->get_triangulation().signals.mesh_movement.connect - (std_cxx11::bind (&FEValuesBase::invalidate_present_cell, - std_cxx11::ref(static_cast&>(*this)))); + (std::bind (&FEValuesBase::invalidate_present_cell, + std::ref(static_cast&>(*this)))); } } else @@ -3499,12 +3499,12 @@ maybe_invalidate_previous_present_cell (const typename Triangulationget_triangulation().signals.post_refinement.connect - (std_cxx11::bind (&FEValuesBase::invalidate_present_cell, - std_cxx11::ref(static_cast&>(*this)))); + (std::bind (&FEValuesBase::invalidate_present_cell, + std::ref(static_cast&>(*this)))); tria_listener_mesh_transform = cell->get_triangulation().signals.mesh_movement.connect - (std_cxx11::bind (&FEValuesBase::invalidate_present_cell, - std_cxx11::ref(static_cast&>(*this)))); + (std::bind (&FEValuesBase::invalidate_present_cell, + std::ref(static_cast&>(*this)))); } } @@ -3678,7 +3678,7 @@ namespace template void reset_pointer_in_place_if_possible - (std_cxx11::unique_ptr &present_cell, + (std::unique_ptr &present_cell, const Iterator &new_cell) { // see if the existing pointer is non-null and if the type of diff --git a/source/fe/mapping.cc b/source/fe/mapping.cc index c8e7d6405b..ff16ef76b0 100644 --- a/source/fe/mapping.cc +++ b/source/fe/mapping.cc @@ -26,11 +26,11 @@ Mapping::~Mapping () template -std_cxx11::array, GeometryInfo::vertices_per_cell> +std::array, GeometryInfo::vertices_per_cell> Mapping::get_vertices ( const typename Triangulation::cell_iterator &cell) const { - std_cxx11::array, GeometryInfo::vertices_per_cell> vertices; + std::array, GeometryInfo::vertices_per_cell> vertices; for (unsigned int i = 0; i < GeometryInfo::vertices_per_cell; ++i) { vertices[i] = cell->vertex(i); diff --git a/source/fe/mapping_fe_field.cc b/source/fe/mapping_fe_field.cc index 8950e44572..6c9ab38875 100644 --- a/source/fe/mapping_fe_field.cc +++ b/source/fe/mapping_fe_field.cc @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -48,6 +47,7 @@ #include #include +#include @@ -1769,8 +1769,8 @@ transform_unit_to_real_cell (const typename Triangulation::cell_it // the right size and transformation shape values already computed at point // p. const Quadrature point_quadrature(p); - std_cxx11::unique_ptr mdata (get_data(update_quadrature_points | update_jacobians, - point_quadrature)); + std::unique_ptr mdata (get_data(update_quadrature_points | update_jacobians, + point_quadrature)); update_internal_dofs(cell, *mdata); @@ -1830,7 +1830,7 @@ transform_real_to_unit_cell (const typename Triangulation::cell_it UpdateFlags update_flags = update_quadrature_points | update_jacobians; if (spacedim>dim) update_flags |= update_jacobian_grads; - std_cxx11::unique_ptr + std::unique_ptr mdata (get_data(update_flags,point_quadrature)); update_internal_dofs(cell, *mdata); diff --git a/source/fe/mapping_manifold.cc b/source/fe/mapping_manifold.cc index e0b7e4e1ec..436562070d 100644 --- a/source/fe/mapping_manifold.cc +++ b/source/fe/mapping_manifold.cc @@ -20,8 +20,6 @@ #include #include #include -#include -#include #include #include #include @@ -37,6 +35,8 @@ #include #include #include +#include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/fe/mapping_q.cc b/source/fe/mapping_q.cc index 12d4ea6e03..a567704aad 100644 --- a/source/fe/mapping_q.cc +++ b/source/fe/mapping_q.cc @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -28,6 +27,7 @@ #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -76,7 +76,7 @@ MappingQ::MappingQ (const unsigned int degree, // created via the shared_ptr objects qp_mapping (this->polynomial_degree>1 ? - std_cxx11::shared_ptr >(new MappingQGeneric(degree)) + std::shared_ptr >(new MappingQGeneric(degree)) : q1_mapping) {} @@ -95,7 +95,7 @@ MappingQ::MappingQ (const MappingQ &mapping) // created via the shared_ptr objects qp_mapping (this->polynomial_degree>1 ? - std_cxx11::shared_ptr >(dynamic_cast*>(mapping.qp_mapping->clone())) + std::shared_ptr >(dynamic_cast*>(mapping.qp_mapping->clone())) : q1_mapping) {} diff --git a/source/fe/mapping_q1.cc b/source/fe/mapping_q1.cc index fdbda6f56e..b8cd975c96 100644 --- a/source/fe/mapping_q1.cc +++ b/source/fe/mapping_q1.cc @@ -20,8 +20,6 @@ #include #include #include -#include -#include #include #include #include @@ -33,6 +31,8 @@ #include #include +#include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/fe/mapping_q1_eulerian.cc b/source/fe/mapping_q1_eulerian.cc index 939cee24fc..8649325814 100644 --- a/source/fe/mapping_q1_eulerian.cc +++ b/source/fe/mapping_q1_eulerian.cc @@ -13,7 +13,6 @@ // // --------------------------------------------------------------------- -#include #include #include #include @@ -30,6 +29,9 @@ #include #include + +#include + DEAL_II_NAMESPACE_OPEN @@ -57,12 +59,12 @@ MappingQ1Eulerian (const VectorType &euler_transform_vectors, template -std_cxx11::array, GeometryInfo::vertices_per_cell> +std::array, GeometryInfo::vertices_per_cell> MappingQ1Eulerian:: get_vertices (const typename Triangulation::cell_iterator &cell) const { - std_cxx11::array, GeometryInfo::vertices_per_cell> vertices; + std::array, GeometryInfo::vertices_per_cell> vertices; // The assertions can not be in the constructor, since this would // require to call dof_handler.distribute_dofs(fe) *before* the mapping // object is constructed, which is not necessarily what we want. @@ -110,7 +112,7 @@ std::vector > MappingQ1Eulerian:: compute_mapping_support_points(const typename Triangulation::cell_iterator &cell) const { - const std_cxx11::array, GeometryInfo::vertices_per_cell> + const std::array, GeometryInfo::vertices_per_cell> vertices = this->get_vertices(cell); std::vector > a(GeometryInfo::vertices_per_cell); diff --git a/source/fe/mapping_q_eulerian.cc b/source/fe/mapping_q_eulerian.cc index 3b014ff336..5f650acf88 100644 --- a/source/fe/mapping_q_eulerian.cc +++ b/source/fe/mapping_q_eulerian.cc @@ -143,7 +143,7 @@ SupportQuadrature (const unsigned int map_degree) // .... COMPUTE MAPPING SUPPORT POINTS template -std_cxx11::array, GeometryInfo::vertices_per_cell> +std::array, GeometryInfo::vertices_per_cell> MappingQEulerian:: get_vertices (const typename Triangulation::cell_iterator &cell) const @@ -152,7 +152,7 @@ get_vertices const std::vector > a = dynamic_cast(*this->qp_mapping).compute_mapping_support_points(cell); - std_cxx11::array, GeometryInfo::vertices_per_cell> vertex_locations; + std::array, GeometryInfo::vertices_per_cell> vertex_locations; std::copy (a.begin(), a.begin()+GeometryInfo::vertices_per_cell, vertex_locations.begin()); @@ -163,7 +163,7 @@ get_vertices template -std_cxx11::array, GeometryInfo::vertices_per_cell> +std::array, GeometryInfo::vertices_per_cell> MappingQEulerian::MappingQEulerianGeneric:: get_vertices (const typename Triangulation::cell_iterator &cell) const diff --git a/source/fe/mapping_q_generic.cc b/source/fe/mapping_q_generic.cc index b00343edde..0b55214b5c 100644 --- a/source/fe/mapping_q_generic.cc +++ b/source/fe/mapping_q_generic.cc @@ -20,8 +20,6 @@ #include #include #include -#include -#include #include #include #include @@ -36,6 +34,8 @@ #include #include #include +#include +#include DEAL_II_NAMESPACE_OPEN @@ -69,7 +69,7 @@ namespace internal template Point<1> transform_real_to_unit_cell - (const std_cxx11::array, GeometryInfo<1>::vertices_per_cell> &vertices, + (const std::array, GeometryInfo<1>::vertices_per_cell> &vertices, const Point &p) { Assert(spacedim == 1, ExcInternalError()); @@ -81,7 +81,7 @@ namespace internal template Point<2> transform_real_to_unit_cell - (const std_cxx11::array, GeometryInfo<2>::vertices_per_cell> &vertices, + (const std::array, GeometryInfo<2>::vertices_per_cell> &vertices, const Point &p) { Assert(spacedim == 2, ExcInternalError()); @@ -180,7 +180,7 @@ namespace internal template Point<3> transform_real_to_unit_cell - (const std_cxx11::array, GeometryInfo<3>::vertices_per_cell> &/*vertices*/, + (const std::array, GeometryInfo<3>::vertices_per_cell> &/*vertices*/, const Point &/*p*/) { // It should not be possible to get here @@ -1691,8 +1691,8 @@ transform_real_to_unit_cell_internal UpdateFlags update_flags = update_quadrature_points | update_jacobians; if (spacedim>dim) update_flags |= update_jacobian_grads; - std_cxx11::unique_ptr mdata (get_data(update_flags, - point_quadrature)); + std::unique_ptr mdata (get_data(update_flags, + point_quadrature)); mdata->mapping_support_points = this->compute_mapping_support_points (cell); @@ -1717,8 +1717,8 @@ transform_real_to_unit_cell_internal UpdateFlags update_flags = update_quadrature_points | update_jacobians; if (spacedim>dim) update_flags |= update_jacobian_grads; - std_cxx11::unique_ptr mdata (get_data(update_flags, - point_quadrature)); + std::unique_ptr mdata (get_data(update_flags, + point_quadrature)); mdata->mapping_support_points = this->compute_mapping_support_points (cell); @@ -1743,8 +1743,8 @@ transform_real_to_unit_cell_internal UpdateFlags update_flags = update_quadrature_points | update_jacobians; if (spacedim>dim) update_flags |= update_jacobian_grads; - std_cxx11::unique_ptr mdata (get_data(update_flags, - point_quadrature)); + std::unique_ptr mdata (get_data(update_flags, + point_quadrature)); mdata->mapping_support_points = this->compute_mapping_support_points (cell); @@ -1769,8 +1769,8 @@ transform_real_to_unit_cell_internal UpdateFlags update_flags = update_quadrature_points | update_jacobians; if (spacedim>dim) update_flags |= update_jacobian_grads; - std_cxx11::unique_ptr mdata (get_data(update_flags, - point_quadrature)); + std::unique_ptr mdata (get_data(update_flags, + point_quadrature)); mdata->mapping_support_points = this->compute_mapping_support_points (cell); @@ -1795,8 +1795,8 @@ transform_real_to_unit_cell_internal UpdateFlags update_flags = update_quadrature_points | update_jacobians; if (spacedim>dim) update_flags |= update_jacobian_grads; - std_cxx11::unique_ptr mdata (get_data(update_flags, - point_quadrature)); + std::unique_ptr mdata (get_data(update_flags, + point_quadrature)); mdata->mapping_support_points = this->compute_mapping_support_points (cell); @@ -1853,7 +1853,7 @@ transform_real_to_unit_cell (const typename Triangulation::cell_it // cell and that value is returned. // * In 3D there is no (known to the authors) exact formula, so the Newton // algorithm is used. - const std_cxx11::array, GeometryInfo::vertices_per_cell> + const std::array, GeometryInfo::vertices_per_cell> vertices = this->get_vertices(cell); try { diff --git a/source/grid/grid_generator.cc b/source/grid/grid_generator.cc index 18bf421b30..7edb5fb1c0 100644 --- a/source/grid/grid_generator.cc +++ b/source/grid/grid_generator.cc @@ -802,7 +802,7 @@ namespace GridGenerator const bool colorize) { Point<2> origin; - std_cxx11::array,2> edges; + std::array,2> edges; edges[0] = corners[0]; edges[1] = corners[1]; std::vector subdivisions; @@ -859,7 +859,7 @@ namespace GridGenerator { Point origin; std::vector subdivisions; - std_cxx11::array,dim> edges; + std::array,dim> edges; for (unsigned int i=0; i &tria, const Point &origin, - const std_cxx11::array,dim> &edges, + const std::array,dim> &edges, const std::vector &subdivisions, const bool colorize) { diff --git a/source/grid/grid_generator.inst.in b/source/grid/grid_generator.inst.in index f2af7dd898..5a7783f593 100644 --- a/source/grid/grid_generator.inst.in +++ b/source/grid/grid_generator.inst.in @@ -47,7 +47,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS subdivided_parallelepiped (Triangulation &, const Point &, - const std_cxx11::array,deal_II_dimension> &, + const std::array,deal_II_dimension> &, const std::vector &, const bool colorize); diff --git a/source/grid/grid_in.cc b/source/grid/grid_in.cc index 05566995d4..09cfe62289 100644 --- a/source/grid/grid_in.cc +++ b/source/grid/grid_in.cc @@ -2552,7 +2552,7 @@ void GridIn::skip_empty_lines (std::istream &in) // if not put the whole thing // back and return if (std::find_if (line.begin(), line.end(), - std_cxx11::bind (std::not_equal_to(),std_cxx11::_1,' ')) + std::bind (std::not_equal_to(),std::placeholders::_1,' ')) != line.end()) { in.putback ('\n'); diff --git a/source/grid/grid_out.cc b/source/grid/grid_out.cc index 00d3fc68ab..e533a2145a 100644 --- a/source/grid/grid_out.cc +++ b/source/grid/grid_out.cc @@ -2495,7 +2495,7 @@ void GridOut::write_vtk (const Triangulation &tria, generate_triangulation_patches(patches, tria.begin_active(), tria.end()); DataOutBase::write_vtk (patches, triangulation_patch_data_names(), - std::vector >(), + std::vector >(), vtk_flags, out); @@ -2519,7 +2519,7 @@ void GridOut::write_vtu (const Triangulation &tria, generate_triangulation_patches(patches, tria.begin_active(), tria.end()); DataOutBase::write_vtu (patches, triangulation_patch_data_names(), - std::vector >(), + std::vector >(), vtu_flags, out); @@ -2594,7 +2594,7 @@ void GridOut::write_mesh_per_processor_as_vtu (const Triangulation Utilities::int_to_string (tria.locally_owned_subdomain(), 4) + ".vtu"); std::ofstream out(new_file.c_str()); - std::vector > vector_data_ranges; + std::vector > vector_data_ranges; DataOutBase::VtkFlags flags; DataOutBase::write_vtu (patches, data_names, diff --git a/source/grid/grid_reordering.cc b/source/grid/grid_reordering.cc index ba75f1ba9b..d489f631b6 100644 --- a/source/grid/grid_reordering.cc +++ b/source/grid/grid_reordering.cc @@ -17,7 +17,6 @@ #include #include #include -#include #include #include diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc index 6c0467c0c5..92c8a9b40d 100644 --- a/source/grid/grid_tools.cc +++ b/source/grid/grid_tools.cc @@ -13,7 +13,6 @@ // // --------------------------------------------------------------------- -#include #include #include #include @@ -49,6 +48,7 @@ #include #include +#include #include #include #include @@ -1581,7 +1581,7 @@ next_cell: std::vector compute_active_cell_halo_layer (const MeshType &mesh, - const std_cxx11::function &predicate) + const std::function &predicate) { std::vector active_halo_layer; std::vector locally_active_vertices_on_subdomain (mesh.get_triangulation().n_vertices(), @@ -1620,7 +1620,7 @@ next_cell: std::vector compute_ghost_cell_halo_layer (const MeshType &mesh) { - std_cxx11::function predicate + std::function predicate = IteratorFilters::LocallyOwnedCell(); const std::vector @@ -1710,7 +1710,7 @@ next_cell: unsigned int max_cellid_size = 0; std::set > vertices_added; std::map > vertices_to_recv; - std::map > > vertices_to_send; active_cell_iterator cell = triangulation.begin_active(), endc = triangulation.end(); @@ -1751,7 +1751,7 @@ next_cell: if (vertices_added.find(tmp)==vertices_added.end()) { vertices_to_send[(*adjacent_cell)->subdomain_id()].push_back( - std_cxx11::tuple (i,cell->vertex_index(i), cell->id().to_string())); if (cell->id().to_string().size() > max_cellid_size) @@ -1827,7 +1827,7 @@ next_cell: vertices_to_send.size()); std::vector first_requests(vertices_to_send.size()); typename std::map > >::iterator vert_to_send_it = vertices_to_send.begin(), vert_to_send_end = vertices_to_send.end(); @@ -1842,9 +1842,9 @@ next_cell: // fill the buffer for (unsigned int j=0; j(vert_to_send_it->second[j]); + vertices_send_buffers[i][2*j] = std::get<0>(vert_to_send_it->second[j]); vertices_send_buffers[i][2*j+1] = - local_to_global_vertex_index[std_cxx11::get<1>(vert_to_send_it->second[j])]; + local_to_global_vertex_index[std::get<1>(vert_to_send_it->second[j])]; } // Send the message @@ -1889,7 +1889,7 @@ next_cell: unsigned int pos = 0; for (unsigned int j=0; j(vert_to_send_it->second[j]); + std::string cell_id = std::get<2>(vert_to_send_it->second[j]); for (unsigned int k=0; k struct OrientationLookupTable<1> { - typedef std_cxx11::array::vertices_per_face> MATCH_T; + typedef std::array::vertices_per_face> MATCH_T; static inline std::bitset<3> lookup (const MATCH_T &) { // The 1D case is trivial @@ -3518,7 +3518,7 @@ next_cell: template<> struct OrientationLookupTable<2> { - typedef std_cxx11::array::vertices_per_face> MATCH_T; + typedef std::array::vertices_per_face> MATCH_T; static inline std::bitset<3> lookup (const MATCH_T &matching) { // In 2D matching faces (=lines) results in two cases: Either @@ -3539,7 +3539,7 @@ next_cell: template<> struct OrientationLookupTable<3> { - typedef std_cxx11::array::vertices_per_face> MATCH_T; + typedef std::array::vertices_per_face> MATCH_T; static inline std::bitset<3> lookup (const MATCH_T &matching) { // The full fledged 3D case. *Yay* @@ -3588,7 +3588,7 @@ next_cell: // Do a full matching of the face vertices: - std_cxx11:: + std:: array::vertices_per_face> matching; std::set face2_vertices; diff --git a/source/grid/grid_tools.inst.in b/source/grid/grid_tools.inst.in index b677fb12c0..7aa1b9ecca 100644 --- a/source/grid/grid_tools.inst.in +++ b/source/grid/grid_tools.inst.in @@ -43,7 +43,7 @@ for (X : TRIANGULATION_AND_DOFHANDLERS; deal_II_dimension : DIMENSIONS ; deal_II template std::vector::type> compute_active_cell_halo_layer (const X &, - const std_cxx11::function::type&)> &); + const std::function::type&)> &); template std::vector::type> diff --git a/source/grid/tria.cc b/source/grid/tria.cc index be582a2cce..ad1710fdea 100644 --- a/source/grid/tria.cc +++ b/source/grid/tria.cc @@ -17,7 +17,6 @@ #include #include #include -#include #include #include @@ -38,8 +37,8 @@ #include #include #include +#include -#include DEAL_II_NAMESPACE_OPEN @@ -2332,7 +2331,7 @@ namespace internal // this file std::map, std::pair::quad_iterator, - std_cxx11::array::lines_per_face> >, + std::array::lines_per_face> >, QuadComparator> needed_quads; for (unsigned int cell=0; cell line_list[GeometryInfo::lines_per_cell], inverse_line_list[GeometryInfo::lines_per_cell]; unsigned int face_line_list[GeometryInfo::lines_per_face]; - std_cxx11::array::lines_per_face> orientation; + std::array::lines_per_face> orientation; for (unsigned int line=0; line::lines_per_cell; ++line) { @@ -2484,7 +2483,7 @@ namespace internal quad = triangulation.begin_raw_quad(); typename std::map, std::pair::quad_iterator, - std_cxx11::array::lines_per_face> >, + std::array::lines_per_face> >, QuadComparator> ::iterator q; for (q = needed_quads.begin(); quad!=triangulation.end_quad(); ++quad, ++q) @@ -4371,7 +4370,7 @@ namespace internal const unsigned int used_cells = std::count_if (triangulation.levels[level+1]->cells.used.begin(), triangulation.levels[level+1]->cells.used.end(), - std_cxx11::bind (std::equal_to(), std_cxx11::_1, true)); + std::bind (std::equal_to(), std::placeholders::_1, true)); // reserve space for the used_cells cells already existing // on the next higher level as well as for the @@ -4396,9 +4395,9 @@ namespace internal // vertices are already in use needed_vertices += std::count_if (triangulation.vertices_used.begin(), triangulation.vertices_used.end(), - std_cxx11::bind (std::equal_to(), - std_cxx11::_1, - true)); + std::bind (std::equal_to(), + std::placeholders::_1, + true)); // if we need more vertices: create them, if not: leave the // array as is, since shrinking is not really possible because // some of the vertices at the end may be in use @@ -4694,7 +4693,7 @@ namespace internal const unsigned int used_cells = std::count_if (triangulation.levels[level+1]->cells.used.begin(), triangulation.levels[level+1]->cells.used.end(), - std_cxx11::bind (std::equal_to(), std_cxx11::_1, true)); + std::bind (std::equal_to(), std::placeholders::_1, true)); // reserve space for the used_cells cells already existing @@ -4730,7 +4729,7 @@ namespace internal // add to needed vertices how many vertices are already in use needed_vertices += std::count_if (triangulation.vertices_used.begin(), triangulation.vertices_used.end(), - std_cxx11::bind (std::equal_to(), std_cxx11::_1, true)); + std::bind (std::equal_to(), std::placeholders::_1, true)); // if we need more vertices: create them, if not: leave the // array as is, since shrinking is not really possible because // some of the vertices at the end may be in use @@ -5100,7 +5099,7 @@ namespace internal const unsigned int used_cells = std::count_if (triangulation.levels[level+1]->cells.used.begin(), triangulation.levels[level+1]->cells.used.end(), - std_cxx11::bind (std::equal_to(), std_cxx11::_1, true)); + std::bind (std::equal_to(), std::placeholders::_1, true)); // reserve space for the used_cells cells already existing @@ -5175,7 +5174,7 @@ namespace internal // add to needed vertices how many vertices are already in use needed_vertices += std::count_if (triangulation.vertices_used.begin(), triangulation.vertices_used.end(), - std_cxx11::bind (std::equal_to(), std_cxx11::_1, true)); + std::bind (std::equal_to(), std::placeholders::_1, true)); // if we need more vertices: create them, if not: leave the // array as is, since shrinking is not really possible because // some of the vertices at the end may be in use @@ -11772,7 +11771,7 @@ unsigned int Triangulation::n_used_vertices () const { return std::count_if (vertices_used.begin(), vertices_used.end(), - std_cxx11::bind (std::equal_to(), std_cxx11::_1, true)); + std::bind (std::equal_to(), std::placeholders::_1, true)); } diff --git a/source/grid/tria_accessor.cc b/source/grid/tria_accessor.cc index a55f4db938..a043d573f5 100644 --- a/source/grid/tria_accessor.cc +++ b/source/grid/tria_accessor.cc @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -27,6 +26,7 @@ #include #include +#include #include DEAL_II_NAMESPACE_OPEN @@ -1640,7 +1640,7 @@ template CellId CellAccessor::id() const { - std_cxx11::array id; + std::array id; CellAccessor ptr = *this; const unsigned int n_child_indices = ptr.level(); diff --git a/source/grid/tria_boundary.cc b/source/grid/tria_boundary.cc index cb810ecaba..c583bb5f06 100644 --- a/source/grid/tria_boundary.cc +++ b/source/grid/tria_boundary.cc @@ -172,7 +172,7 @@ get_line_support_points (const unsigned int n_intermediate_points) const // another thread might have created points in the meantime if (points[n_intermediate_points].get() == 0) { - std_cxx11::shared_ptr > + std::shared_ptr > quadrature (new QGaussLobatto<1>(n_intermediate_points+2)); points[n_intermediate_points] = quadrature; } diff --git a/source/grid/tria_objects.cc b/source/grid/tria_objects.cc index 4fdff58a31..e5f768fce7 100644 --- a/source/grid/tria_objects.cc +++ b/source/grid/tria_objects.cc @@ -14,7 +14,6 @@ // --------------------------------------------------------------------- #include -#include #include #include #include @@ -171,7 +170,7 @@ namespace internal const unsigned int new_size = new_hexes + std::count_if (used.begin(), used.end(), - std_cxx11::bind (std::equal_to(), std_cxx11::_1, true)); + std::bind (std::equal_to(), std::placeholders::_1, true)); // see above... if (new_size>cells.size()) diff --git a/source/hp/dof_handler.cc b/source/hp/dof_handler.cc index 788ae35d0a..0f1815a2eb 100644 --- a/source/hp/dof_handler.cc +++ b/source/hp/dof_handler.cc @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include @@ -82,7 +81,7 @@ namespace internal void ensure_existence_of_dof_identities (const FiniteElement &fe1, const FiniteElement &fe2, - std_cxx11::shared_ptr &identities) + std::shared_ptr &identities) { // see if we need to fill this // entry, or whether it already @@ -94,7 +93,7 @@ namespace internal case 0: { identities = - std_cxx11::shared_ptr + std::shared_ptr (new DoFIdentities(fe1.hp_vertex_dof_identities(fe2))); break; } @@ -102,7 +101,7 @@ namespace internal case 1: { identities = - std_cxx11::shared_ptr + std::shared_ptr (new DoFIdentities(fe1.hp_line_dof_identities(fe2))); break; } @@ -110,7 +109,7 @@ namespace internal case 2: { identities = - std_cxx11::shared_ptr + std::shared_ptr (new DoFIdentities(fe1.hp_quad_dof_identities(fe2))); break; } @@ -1676,16 +1675,16 @@ namespace hp tria_listeners.push_back (tria.signals.pre_refinement - .connect (std_cxx11::bind (&DoFHandler::pre_refinement_action, - std_cxx11::ref(*this)))); + .connect (std::bind (&DoFHandler::pre_refinement_action, + std::ref(*this)))); tria_listeners.push_back (tria.signals.post_refinement - .connect (std_cxx11::bind (&DoFHandler::post_refinement_action, - std_cxx11::ref(*this)))); + .connect (std::bind (&DoFHandler::post_refinement_action, + std::ref(*this)))); tria_listeners.push_back (tria.signals.create - .connect (std_cxx11::bind (&DoFHandler::post_refinement_action, - std_cxx11::ref(*this)))); + .connect (std::bind (&DoFHandler::post_refinement_action, + std::ref(*this)))); } @@ -2100,7 +2099,7 @@ namespace hp // vertices at all, I can't think // of a finite element that would // make that necessary... - Table<2,std_cxx11::shared_ptr > + Table<2,std::shared_ptr > vertex_dof_identities (get_fe().size(), get_fe().size()); @@ -2245,7 +2244,7 @@ namespace hp // is to first treat all pairs of finite elements that have *identical* dofs, // and then only deal with those that are not identical of which we can // handle at most 2 - Table<2,std_cxx11::shared_ptr > + Table<2,std::shared_ptr > line_dof_identities (finite_elements->size(), finite_elements->size()); @@ -2455,7 +2454,7 @@ namespace hp // for quads only in 4d and // higher, so this isn't a // particularly frequent case - Table<2,std_cxx11::shared_ptr > + Table<2,std::shared_ptr > quad_dof_identities (finite_elements->size(), finite_elements->size()); @@ -3210,16 +3209,16 @@ namespace hp std::transform (tria->levels[i]->cells.children.begin (), tria->levels[i]->cells.children.end (), has_children_level->begin (), - std_cxx11::bind(std::not_equal_to(), - std_cxx11::_1, - -1)); + std::bind(std::not_equal_to(), + std::placeholders::_1, + -1)); else std::transform (tria->levels[i]->cells.refinement_cases.begin (), tria->levels[i]->cells.refinement_cases.end (), has_children_level->begin (), - std_cxx11::bind (std::not_equal_to(), - std_cxx11::_1, - static_cast(RefinementCase::no_refinement))); + std::bind (std::not_equal_to(), + std::placeholders::_1, + static_cast(RefinementCase::no_refinement))); has_children.push_back (has_children_level); } diff --git a/source/hp/fe_collection.cc b/source/hp/fe_collection.cc index 5d3ba28055..e7a4c3a400 100644 --- a/source/hp/fe_collection.cc +++ b/source/hp/fe_collection.cc @@ -200,7 +200,7 @@ namespace hp "same number of vector components!")); finite_elements - .push_back (std_cxx11::shared_ptr >(new_fe.clone())); + .push_back (std::shared_ptr >(new_fe.clone())); } diff --git a/source/hp/fe_values.cc b/source/hp/fe_values.cc index 940df00f44..c212cccaf8 100644 --- a/source/hp/fe_values.cc +++ b/source/hp/fe_values.cc @@ -94,7 +94,7 @@ namespace internal if (fe_values_table(present_fe_values_index).get() == 0) fe_values_table(present_fe_values_index) = - std_cxx11::shared_ptr + std::shared_ptr (new FEValuesType ((*mapping_collection)[mapping_index], (*fe_collection)[fe_index], q_collection[q_index], diff --git a/source/hp/mapping_collection.cc b/source/hp/mapping_collection.cc index b1bc5f0cd8..4a2db5abe3 100644 --- a/source/hp/mapping_collection.cc +++ b/source/hp/mapping_collection.cc @@ -34,7 +34,7 @@ namespace hp MappingCollection (const Mapping &mapping) { mappings - .push_back (std_cxx11::shared_ptr >(mapping.clone())); + .push_back (std::shared_ptr >(mapping.clone())); } @@ -75,7 +75,7 @@ namespace hp MappingCollection::push_back (const Mapping &new_mapping) { mappings - .push_back (std_cxx11::shared_ptr >(new_mapping.clone())); + .push_back (std::shared_ptr >(new_mapping.clone())); } //--------------------------------------------------------------------------- diff --git a/source/lac/cuda_vector.cu b/source/lac/cuda_vector.cu index c0aa183792..64e60a6a8c 100644 --- a/source/lac/cuda_vector.cu +++ b/source/lac/cuda_vector.cu @@ -567,7 +567,7 @@ namespace LinearAlgebra template void Vector::import(const ReadWriteVector &V, VectorOperation::values operation, - std_cxx11::shared_ptr ) + std::shared_ptr ) { if (operation == VectorOperation::insert) { diff --git a/source/lac/sparsity_pattern.cc b/source/lac/sparsity_pattern.cc index 9b0558aee0..32e6523f02 100644 --- a/source/lac/sparsity_pattern.cc +++ b/source/lac/sparsity_pattern.cc @@ -396,7 +396,7 @@ SparsityPattern::compress () const std::size_t nonzero_elements = std::count_if (&colnums[rowstart[0]], &colnums[rowstart[rows]], - std_cxx11::bind(std::not_equal_to(), std_cxx11::_1, invalid_entry)); + std::bind(std::not_equal_to(), std::placeholders::_1, invalid_entry)); // now allocate the respective memory size_type *new_colnums = new size_type[nonzero_elements]; diff --git a/source/lac/trilinos_epetra_communication_pattern.cc b/source/lac/trilinos_epetra_communication_pattern.cc index 975a74d971..1c687aaf7a 100644 --- a/source/lac/trilinos_epetra_communication_pattern.cc +++ b/source/lac/trilinos_epetra_communication_pattern.cc @@ -20,8 +20,8 @@ #ifdef DEAL_II_WITH_MPI #include -#include #include "Epetra_Map.h" +#include DEAL_II_NAMESPACE_OPEN @@ -42,7 +42,7 @@ namespace LinearAlgebra const IndexSet &read_write_vector_index_set, const MPI_Comm &communicator) { - comm = std_cxx11::make_shared(communicator); + comm = std::make_shared(communicator); Epetra_Map vector_space_vector_map = vector_space_vector_index_set.make_trilinos_map(*comm, false); diff --git a/source/lac/trilinos_epetra_vector.cc b/source/lac/trilinos_epetra_vector.cc index dc0e70e700..28a331fe21 100644 --- a/source/lac/trilinos_epetra_vector.cc +++ b/source/lac/trilinos_epetra_vector.cc @@ -102,7 +102,7 @@ namespace LinearAlgebra void Vector::import(const ReadWriteVector &V, VectorOperation::values operation, - std_cxx11::shared_ptr communication_pattern) + std::shared_ptr communication_pattern) { // If no communication pattern is given, create one. Otherwsie, use the // one given. @@ -122,7 +122,7 @@ namespace LinearAlgebra else { epetra_comm_pattern = - std_cxx11::dynamic_pointer_cast (communication_pattern); + std::dynamic_pointer_cast (communication_pattern); AssertThrow(epetra_comm_pattern != NULL, ExcMessage(std::string("The communication pattern is not of type ") + "LinearAlgebra::EpetraWrappers::CommunicationPattern.")); diff --git a/source/lac/trilinos_solver.cc b/source/lac/trilinos_solver.cc index 9d5a61823e..f87ac67aa0 100644 --- a/source/lac/trilinos_solver.cc +++ b/source/lac/trilinos_solver.cc @@ -371,10 +371,10 @@ namespace TrilinosWrappers private: double initial_residual; double current_residual; - std_cxx11::shared_ptr status_test_collection; - std_cxx11::shared_ptr status_test_max_steps; - std_cxx11::shared_ptr status_test_abs_tol; - std_cxx11::shared_ptr status_test_rel_tol; + std::shared_ptr status_test_collection; + std::shared_ptr status_test_max_steps; + std::shared_ptr status_test_abs_tol; + std::shared_ptr status_test_rel_tol; }; diff --git a/source/lac/trilinos_sparse_matrix.cc b/source/lac/trilinos_sparse_matrix.cc index d27b798aa7..a6d704af78 100644 --- a/source/lac/trilinos_sparse_matrix.cc +++ b/source/lac/trilinos_sparse_matrix.cc @@ -463,10 +463,10 @@ namespace TrilinosWrappers const Epetra_Map &input_col_map, const SparsityPatternType &sparsity_pattern, const bool exchange_data, - std_cxx11::shared_ptr &column_space_map, - std_cxx11::shared_ptr &matrix, - std_cxx11::shared_ptr &nonlocal_matrix, - std_cxx11::shared_ptr &nonlocal_matrix_exporter) + std::shared_ptr &column_space_map, + std::shared_ptr &matrix, + std::shared_ptr &nonlocal_matrix, + std::shared_ptr &nonlocal_matrix_exporter) { // release memory before reallocation matrix.reset(); @@ -519,7 +519,7 @@ namespace TrilinosWrappers // col_map that tells how the domain dofs of the matrix will be // distributed). for only one processor, we can directly assign the // columns as well. Compare this with bug # 4123 in the Sandia Bugzilla. - std_cxx11::shared_ptr graph; + std::shared_ptr graph; if (input_row_map.Comm().NumProc() > 1) graph.reset (new Epetra_CrsGraph (Copy, input_row_map, &n_entries_per_row[0], true)); @@ -599,10 +599,10 @@ namespace TrilinosWrappers const Epetra_Map &input_col_map, const DynamicSparsityPattern &sparsity_pattern, const bool exchange_data, - std_cxx11::shared_ptr &column_space_map, - std_cxx11::shared_ptr &matrix, - std_cxx11::shared_ptr &nonlocal_matrix, - std_cxx11::shared_ptr &nonlocal_matrix_exporter) + std::shared_ptr &column_space_map, + std::shared_ptr &matrix, + std::shared_ptr &nonlocal_matrix, + std::shared_ptr &nonlocal_matrix_exporter) { matrix.reset(); nonlocal_matrix.reset(); @@ -666,8 +666,8 @@ namespace TrilinosWrappers (ghost_rows.size()>0)?(&ghost_rows[0]):NULL, 0, input_row_map.Comm()); - std_cxx11::shared_ptr graph; - std_cxx11::shared_ptr nonlocal_graph; + std::shared_ptr graph; + std::shared_ptr nonlocal_graph; if (input_row_map.Comm().NumProc() > 1) { graph.reset (new Epetra_CrsGraph (Copy, input_row_map, diff --git a/source/lac/trilinos_sparsity_pattern.cc b/source/lac/trilinos_sparsity_pattern.cc index 329ec58f9a..55fa3b1929 100644 --- a/source/lac/trilinos_sparsity_pattern.cc +++ b/source/lac/trilinos_sparsity_pattern.cc @@ -332,9 +332,9 @@ namespace TrilinosWrappers reinit_sp (const Epetra_Map &row_map, const Epetra_Map &col_map, const size_type n_entries_per_row, - std_cxx11::shared_ptr &column_space_map, - std_cxx11::shared_ptr &graph, - std_cxx11::shared_ptr &nonlocal_graph) + std::shared_ptr &column_space_map, + std::shared_ptr &graph, + std::shared_ptr &nonlocal_graph) { Assert(row_map.IsOneToOne(), ExcMessage("Row map must be 1-to-1, i.e., no overlap between " @@ -377,9 +377,9 @@ namespace TrilinosWrappers reinit_sp (const Epetra_Map &row_map, const Epetra_Map &col_map, const std::vector &n_entries_per_row, - std_cxx11::shared_ptr &column_space_map, - std_cxx11::shared_ptr &graph, - std_cxx11::shared_ptr &nonlocal_graph) + std::shared_ptr &column_space_map, + std::shared_ptr &graph, + std::shared_ptr &nonlocal_graph) { Assert(row_map.IsOneToOne(), ExcMessage("Row map must be 1-to-1, i.e., no overlap between " @@ -426,9 +426,9 @@ namespace TrilinosWrappers const Epetra_Map &col_map, const SparsityPatternType &sp, const bool exchange_data, - std_cxx11::shared_ptr &column_space_map, - std_cxx11::shared_ptr &graph, - std_cxx11::shared_ptr &nonlocal_graph) + std::shared_ptr &column_space_map, + std::shared_ptr &graph, + std::shared_ptr &nonlocal_graph) { nonlocal_graph.reset (); graph.reset (); diff --git a/source/lac/trilinos_vector.cc b/source/lac/trilinos_vector.cc index d1e878266b..9fb3d4ef91 100644 --- a/source/lac/trilinos_vector.cc +++ b/source/lac/trilinos_vector.cc @@ -406,7 +406,7 @@ namespace TrilinosWrappers Epetra_Map new_map (v.size(), n_elements, &global_ids[0], 0, v.block(0).vector_partitioner().Comm()); - std_cxx11::shared_ptr actual_vec; + std::shared_ptr actual_vec; if ( import_data == true ) actual_vec.reset (new Epetra_FEVector (new_map)); else diff --git a/source/multigrid/mg_transfer_block.cc b/source/multigrid/mg_transfer_block.cc index cb77ccfeb0..21fcd462af 100644 --- a/source/multigrid/mg_transfer_block.cc +++ b/source/multigrid/mg_transfer_block.cc @@ -277,9 +277,9 @@ void MGTransferBlockBase::build_matrices ( for (unsigned int i=0; i (new BlockSparsityPattern)); + .push_back (std::shared_ptr (new BlockSparsityPattern)); prolongation_matrices - .push_back (std_cxx11::shared_ptr > (new BlockSparseMatrix)); + .push_back (std::shared_ptr > (new BlockSparseMatrix)); } // two fields which will store the @@ -515,9 +515,9 @@ void MGTransferBlockSelect::build_matrices ( // copy_indices. const types::global_dof_index n_active_dofs = std::count_if (temp_copy_indices.begin(), temp_copy_indices.end(), - std_cxx11::bind (std::not_equal_to(), - std_cxx11::_1, - numbers::invalid_dof_index)); + std::bind (std::not_equal_to(), + std::placeholders::_1, + numbers::invalid_dof_index)); copy_indices[selected_block][level].resize (n_active_dofs); types::global_dof_index counter = 0; for (types::global_dof_index i=0; i::build_matrices ( const types::global_dof_index n_active_dofs = std::count_if (temp_copy_indices[block].begin(), temp_copy_indices[block].end(), - std_cxx11::bind (std::not_equal_to(), - std_cxx11::_1, - numbers::invalid_dof_index)); + std::bind (std::not_equal_to(), + std::placeholders::_1, + numbers::invalid_dof_index)); copy_indices[block][level].resize (n_active_dofs); types::global_dof_index counter = 0; for (types::global_dof_index i=0; i (new BlockSparsityPattern)); + .push_back (std::shared_ptr (new BlockSparsityPattern)); prolongation_matrices - .push_back (std_cxx11::shared_ptr > (new BlockSparseMatrix)); + .push_back (std::shared_ptr > (new BlockSparseMatrix)); } // two fields which will store the @@ -659,9 +659,9 @@ void MGTransferSelect::build_matrices ( // global to level dofs const types::global_dof_index n_active_dofs = std::count_if (temp_copy_indices.begin(), temp_copy_indices.end(), - std_cxx11::bind (std::not_equal_to(), - std_cxx11::_1, - numbers::invalid_dof_index)); + std::bind (std::not_equal_to(), + std::placeholders::_1, + numbers::invalid_dof_index)); copy_to_and_from_indices[level].resize (n_active_dofs); types::global_dof_index counter = 0; for (types::global_dof_index i=0; i part + const std::shared_ptr part = ghosted_level_vector.get_partitioner(); ghosted_dofs.add_indices(part->ghost_indices()); for (unsigned int i=0; i > fe_1d + std::shared_ptr > fe_1d (FETools::get_fe_by_name<1,1>(fe_name)); const FiniteElement<1> &fe = *fe_1d; diff --git a/source/multigrid/mg_transfer_prebuilt.cc b/source/multigrid/mg_transfer_prebuilt.cc index 377bfa6b7c..a35c37353c 100644 --- a/source/multigrid/mg_transfer_prebuilt.cc +++ b/source/multigrid/mg_transfer_prebuilt.cc @@ -153,9 +153,9 @@ void MGTransferPrebuilt::build_matrices for (unsigned int i=0; i::Sparsity> (new typename internal::MatrixSelector::Sparsity)); + (std::shared_ptr::Sparsity> (new typename internal::MatrixSelector::Sparsity)); prolongation_matrices.push_back - (std_cxx11::shared_ptr::Matrix> (new typename internal::MatrixSelector::Matrix)); + (std::shared_ptr::Matrix> (new typename internal::MatrixSelector::Matrix)); } // two fields which will store the diff --git a/source/numerics/data_out.cc b/source/numerics/data_out.cc index 6977459c17..4fa6429a8f 100644 --- a/source/numerics/data_out.cc +++ b/source/numerics/data_out.cc @@ -41,7 +41,7 @@ namespace internal const unsigned int n_subdivisions, const std::vector &n_postprocessor_outputs, const Mapping &mapping, - const std::vector > > &finite_elements, + const std::vector > > &finite_elements, const UpdateFlags update_flags, const std::vector > &cell_to_patch_index_map) : @@ -453,17 +453,17 @@ void DataOut::build_patches if (all_cells.size() > 0) WorkStream::run (&all_cells[0], &all_cells[0]+all_cells.size(), - std_cxx11::bind(&DataOut::build_one_patch, - this, - std_cxx11::_1, - std_cxx11::_2, - /* no std_cxx11::_3, since this function doesn't actually need a - copy data object -- it just writes everything right into the - output array */ - n_subdivisions, - curved_cell_region), + std::bind(&DataOut::build_one_patch, + this, + std::placeholders::_1, + std::placeholders::_2, + /* no std::placeholders::_3, since this function doesn't actually need a + copy data object -- it just writes everything right into the + output array */ + n_subdivisions, + curved_cell_region), // no copy-local-to-global function needed here - std_cxx11::function(), + std::function(), thread_data, /* dummy CopyData object = */ 0, // experimenting shows that we can make things run a bit diff --git a/source/numerics/data_out_dof_data.cc b/source/numerics/data_out_dof_data.cc index 8883fc6044..d8a7f6472f 100644 --- a/source/numerics/data_out_dof_data.cc +++ b/source/numerics/data_out_dof_data.cc @@ -53,7 +53,7 @@ namespace internal const unsigned int n_subdivisions, const std::vector &n_postprocessor_outputs, const Mapping &mapping, - const std::vector > > &finite_elements, + const std::vector > > &finite_elements, const UpdateFlags update_flags, const bool use_face_values) : @@ -206,7 +206,7 @@ namespace internal template void ParallelDataBase:: - reinit_all_fe_values(std::vector > > &dof_data, + reinit_all_fe_values(std::vector > > &dof_data, const typename dealii::Triangulation::cell_iterator &cell, const unsigned int face) { @@ -990,9 +990,9 @@ add_data_vector (const VectorType &vec, = new internal::DataOut::DataEntry(dofs, &vec, names, data_component_interpretation); if (actual_type == type_dof_data) - dof_data.push_back (std_cxx11::shared_ptr >(new_entry)); + dof_data.push_back (std::shared_ptr >(new_entry)); else - cell_data.push_back (std_cxx11::shared_ptr >(new_entry)); + cell_data.push_back (std::shared_ptr >(new_entry)); } @@ -1020,7 +1020,7 @@ add_data_vector (const VectorType &vec, internal::DataOut::DataEntryBase *new_entry = new internal::DataOut::DataEntry(dofs, &vec, &data_postprocessor); - dof_data.push_back (std_cxx11::shared_ptr >(new_entry)); + dof_data.push_back (std::shared_ptr >(new_entry)); } @@ -1043,7 +1043,7 @@ add_data_vector (const DoFHandlerType &dof_handler, internal::DataOut::DataEntryBase *new_entry = new internal::DataOut::DataEntry(&dof_handler, &vec, &data_postprocessor); - dof_data.push_back (std_cxx11::shared_ptr >(new_entry)); + dof_data.push_back (std::shared_ptr >(new_entry)); } @@ -1121,7 +1121,7 @@ add_data_vector internal::DataOut::DataEntryBase *new_entry = new internal::DataOut::DataEntry(&dof_handler, &data, names, data_component_interpretation); - dof_data.push_back (std_cxx11::shared_ptr >(new_entry)); + dof_data.push_back (std::shared_ptr >(new_entry)); } @@ -1186,7 +1186,7 @@ get_dataset_names () const // collect the names of dof // and cell data typedef - typename std::vector > >::const_iterator + typename std::vector > >::const_iterator data_iterator; for (data_iterator d=dof_data.begin(); @@ -1206,16 +1206,16 @@ get_dataset_names () const template -std::vector > +std::vector > DataOut_DoFData::get_vector_data_ranges () const { - std::vector > + std::vector > ranges; // collect the ranges of dof // and cell data typedef - typename std::vector > >::const_iterator + typename std::vector > >::const_iterator data_iterator; unsigned int output_component = 0; @@ -1261,7 +1261,7 @@ DataOut_DoFData::get_vector_data_range // finally add a corresponding // range - std_cxx11::tuple + std::tuple range (output_component, output_component+patch_space_dim-1, name); @@ -1310,13 +1310,13 @@ DataOut_DoFData::get_patches () const template -std::vector > > DataOut_DoFData::get_finite_elements() const { const unsigned int dhdim = DoFHandlerType::dimension; const unsigned int dhspacedim = DoFHandlerType::space_dimension; - std::vector > > + std::vector > > finite_elements(this->dof_data.size()); for (unsigned int i=0; idof_data.size(); ++i) { diff --git a/source/numerics/data_out_dof_data.inst.in b/source/numerics/data_out_dof_data.inst.in index 8b77b2fb4b..123cf995d3 100644 --- a/source/numerics/data_out_dof_data.inst.in +++ b/source/numerics/data_out_dof_data.inst.in @@ -421,7 +421,7 @@ for (DH : DOFHANDLER_TEMPLATES; deal_II_dimension : DIMENSIONS; deal_II_space_di void ParallelDataBase:: reinit_all_fe_values > - (std::vector > > > &dof_data, + (std::vector > > > &dof_data, const dealii::Triangulation::cell_iterator &cell, const unsigned int face); #endif diff --git a/source/numerics/data_out_faces.cc b/source/numerics/data_out_faces.cc index a81fd310bc..a8ecfcc96d 100644 --- a/source/numerics/data_out_faces.cc +++ b/source/numerics/data_out_faces.cc @@ -40,7 +40,7 @@ namespace internal const unsigned int n_subdivisions, const std::vector &n_postprocessor_outputs, const Mapping &mapping, - const std::vector > > &finite_elements, + const std::vector > > &finite_elements, const UpdateFlags update_flags) : internal::DataOut:: @@ -345,11 +345,11 @@ void DataOutFaces::build_patches (const Mapping & // now build the patches in parallel WorkStream::run (&all_faces[0], &all_faces[0]+all_faces.size(), - std_cxx11::bind(&DataOutFaces::build_one_patch, - this, std_cxx11::_1, std_cxx11::_2, std_cxx11::_3), - std_cxx11::bind(&internal::DataOutFaces:: - append_patch_to_list, - std_cxx11::_1, std_cxx11::ref(this->patches)), + std::bind(&DataOutFaces::build_one_patch, + this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), + std::bind(&internal::DataOutFaces:: + append_patch_to_list, + std::placeholders::_1, std::ref(this->patches)), thread_data, sample_patch); } diff --git a/source/numerics/data_out_rotation.cc b/source/numerics/data_out_rotation.cc index 403cabaa2d..664ec0e9cd 100644 --- a/source/numerics/data_out_rotation.cc +++ b/source/numerics/data_out_rotation.cc @@ -54,7 +54,7 @@ namespace internal const unsigned int n_patches_per_circle, const std::vector &n_postprocessor_outputs, const Mapping &mapping, - const std::vector > > &finite_elements, + const std::vector > > &finite_elements, const UpdateFlags update_flags) : internal::DataOut:: @@ -476,11 +476,11 @@ void DataOutRotation::build_patches (const unsigned int n_pa // now build the patches in parallel WorkStream::run (&all_cells[0], &all_cells[0]+all_cells.size(), - std_cxx11::bind(&DataOutRotation::build_one_patch, - this, std_cxx11::_1, std_cxx11::_2, std_cxx11::_3), - std_cxx11::bind(&internal::DataOutRotation - ::append_patch_to_list, - std_cxx11::_1, std_cxx11::ref(this->patches)), + std::bind(&DataOutRotation::build_one_patch, + this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), + std::bind(&internal::DataOutRotation + ::append_patch_to_list, + std::placeholders::_1, std::ref(this->patches)), thread_data, new_patches); } diff --git a/source/numerics/derivative_approximation.cc b/source/numerics/derivative_approximation.cc index 857b67f8a4..f760e06ab6 100644 --- a/source/numerics/derivative_approximation.cc +++ b/source/numerics/derivative_approximation.cc @@ -931,26 +931,26 @@ namespace DerivativeApproximation template class DoFHandlerType, class InputVector, int spacedim> void approximate - (SynchronousIterators, false > >, Vector::iterator> > const &cell, + (SynchronousIterators, false > >, Vector::iterator> > const &cell, const Mapping &mapping, const DoFHandlerType &dof_handler, const InputVector &solution, const unsigned int component) { // if the cell is not locally owned, then there is nothing to do - if (std_cxx11::get<0>(*cell)->is_locally_owned() == false) - *std_cxx11::get<1>(*cell) = 0; + if (std::get<0>(*cell)->is_locally_owned() == false) + *std::get<1>(*cell) = 0; else { typename DerivativeDescription::Derivative derivative; // call the function doing the actual // work on this cell approximate_cell - (mapping,dof_handler,solution,component,std_cxx11::get<0>(*cell),derivative); + (mapping,dof_handler,solution,component,std::get<0>(*cell),derivative); // evaluate the norm and fill the vector //*derivative_norm_on_this_cell - *std_cxx11::get<1>(*cell) = DerivativeDescription::derivative_norm (derivative); + *std::get<1>(*cell) = DerivativeDescription::derivative_norm (derivative); } } @@ -980,7 +980,7 @@ namespace DerivativeApproximation Assert (component < dof_handler.get_fe().n_components(), ExcIndexRange (component, 0, dof_handler.get_fe().n_components())); - typedef std_cxx11::tuple, false> >, Vector::iterator> Iterators; SynchronousIterators begin(Iterators(dof_handler.begin_active(), @@ -992,15 +992,15 @@ namespace DerivativeApproximation // to write in derivative_norm. Scratch and CopyData are also useless. WorkStream::run(begin, end, - static_cast const &, - Assembler::Scratch const &, Assembler::CopyData &)> > - (std_cxx11::bind(&approximate, - std_cxx11::_1, - std_cxx11::cref(mapping), - std_cxx11::cref(dof_handler), - std_cxx11::cref(solution),component)), - std_cxx11::function (), + static_cast const &, + Assembler::Scratch const &, Assembler::CopyData &)> > + (std::bind(&approximate, + std::placeholders::_1, + std::cref(mapping), + std::cref(dof_handler), + std::cref(solution),component)), + std::function (), internal::Assembler::Scratch (),internal::Assembler::CopyData ()); } diff --git a/source/numerics/error_estimator_1d.cc b/source/numerics/error_estimator_1d.cc index 033573ce55..b38c6be421 100644 --- a/source/numerics/error_estimator_1d.cc +++ b/source/numerics/error_estimator_1d.cc @@ -40,12 +40,12 @@ #include #include -#include #include #include #include #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/numerics/point_value_history.cc b/source/numerics/point_value_history.cc index fbd5d18d1e..eb94b7b670 100644 --- a/source/numerics/point_value_history.cc +++ b/source/numerics/point_value_history.cc @@ -94,8 +94,8 @@ PointValueHistory::PointValueHistory (const DoFHandler &dof_handler, = std::vector > (n_indep, std::vector (0)); indep_names = std::vector (); - tria_listener = dof_handler.get_triangulation().signals.any_change.connect (std_cxx11::bind (&PointValueHistory::tria_change_listener, - std_cxx11::ref(*this))); + tria_listener = dof_handler.get_triangulation().signals.any_change.connect (std::bind (&PointValueHistory::tria_change_listener, + std::ref(*this))); } @@ -124,8 +124,8 @@ PointValueHistory::PointValueHistory (const PointValueHistory &point_value_ // Presume subscribe new instance? if (have_dof_handler) { - tria_listener = dof_handler->get_triangulation().signals.any_change.connect (std_cxx11::bind (&PointValueHistory::tria_change_listener, - std_cxx11::ref(*this))); + tria_listener = dof_handler->get_triangulation().signals.any_change.connect (std::bind (&PointValueHistory::tria_change_listener, + std::ref(*this))); } } @@ -156,8 +156,8 @@ PointValueHistory::operator= (const PointValueHistory &point_value_history) // Presume subscribe new instance? if (have_dof_handler) { - tria_listener = dof_handler->get_triangulation().signals.any_change.connect (std_cxx11::bind (&PointValueHistory::tria_change_listener, - std_cxx11::ref(*this))); + tria_listener = dof_handler->get_triangulation().signals.any_change.connect (std::bind (&PointValueHistory::tria_change_listener, + std::ref(*this))); } return * this; diff --git a/source/numerics/time_dependent.cc b/source/numerics/time_dependent.cc index ed10906b97..1cf56e6b0c 100644 --- a/source/numerics/time_dependent.cc +++ b/source/numerics/time_dependent.cc @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -160,8 +159,8 @@ void TimeDependent::delete_timestep (const unsigned int position) void TimeDependent::solve_primal_problem () { - do_loop (std_cxx11::bind(&TimeStepBase::init_for_primal_problem, std_cxx11::_1), - std_cxx11::bind(&TimeStepBase::solve_primal_problem, std_cxx11::_1), + do_loop (std::bind(&TimeStepBase::init_for_primal_problem, std::placeholders::_1), + std::bind(&TimeStepBase::solve_primal_problem, std::placeholders::_1), timestepping_data_primal, forward); } @@ -170,8 +169,8 @@ TimeDependent::solve_primal_problem () void TimeDependent::solve_dual_problem () { - do_loop (std_cxx11::bind(&TimeStepBase::init_for_dual_problem, std_cxx11::_1), - std_cxx11::bind(&TimeStepBase::solve_dual_problem, std_cxx11::_1), + do_loop (std::bind(&TimeStepBase::init_for_dual_problem, std::placeholders::_1), + std::bind(&TimeStepBase::solve_dual_problem, std::placeholders::_1), timestepping_data_dual, backward); } @@ -180,8 +179,8 @@ TimeDependent::solve_dual_problem () void TimeDependent::postprocess () { - do_loop (std_cxx11::bind(&TimeStepBase::init_for_postprocessing, std_cxx11::_1), - std_cxx11::bind(&TimeStepBase::postprocess_timestep, std_cxx11::_1), + do_loop (std::bind(&TimeStepBase::init_for_postprocessing, std::placeholders::_1), + std::bind(&TimeStepBase::postprocess_timestep, std::placeholders::_1), timestepping_data_postprocess, forward); } @@ -216,7 +215,7 @@ void TimeDependent::end_sweep () void (TimeDependent::*p) (const unsigned int, const unsigned int) = &TimeDependent::end_sweep; parallel::apply_to_subranges (0U, timesteps.size(), - std_cxx11::bind (p, this, std_cxx11::_1, std_cxx11::_2), + std::bind (p, this, std::placeholders::_1, std::placeholders::_2), 1); } diff --git a/source/numerics/vector_tools_project_qp.inst.in b/source/numerics/vector_tools_project_qp.inst.in index 4d76bdd37b..966e05d837 100644 --- a/source/numerics/vector_tools_project_qp.inst.in +++ b/source/numerics/vector_tools_project_qp.inst.in @@ -23,7 +23,7 @@ for (VEC: REAL_NONBLOCK_VECTORS; deal_II_dimension : DIMENSIONS) const DoFHandler &, const ConstraintMatrix &, const Quadrature &, - const std_cxx11::function::active_cell_iterator &, const unsigned int)>, + const std::function::active_cell_iterator &, const unsigned int)>, VEC &); \} diff --git a/source/numerics/vector_tools_project_qpmf.inst.in b/source/numerics/vector_tools_project_qpmf.inst.in index 101e933cd0..234a485a7d 100644 --- a/source/numerics/vector_tools_project_qpmf.inst.in +++ b/source/numerics/vector_tools_project_qpmf.inst.in @@ -21,17 +21,17 @@ for (VEC: REAL_NONBLOCK_VECTORS; deal_II_dimension : DIMENSIONS) template void project( - std_cxx11::shared_ptr > matrix_free, + std::shared_ptr > matrix_free, const ConstraintMatrix &constraints, - const std_cxx11::function< VectorizedArray (const unsigned int, const unsigned int)>, + const std::function< VectorizedArray (const unsigned int, const unsigned int)>, VEC &); template void project( - std_cxx11::shared_ptr > matrix_free, + std::shared_ptr > matrix_free, const ConstraintMatrix &constraints, const unsigned int, - const std_cxx11::function< VectorizedArray (const unsigned int, const unsigned int)>, + const std::function< VectorizedArray (const unsigned int, const unsigned int)>, VEC &); \} diff --git a/source/opencascade/boundary_lib.cc b/source/opencascade/boundary_lib.cc index b38fc1d668..2dac7d1716 100644 --- a/source/opencascade/boundary_lib.cc +++ b/source/opencascade/boundary_lib.cc @@ -144,7 +144,7 @@ namespace OpenCASCADE tolerance(tolerance) { Assert(spacedim == 3, ExcNotImplemented()); - Assert(std_cxx11::get<0>(count_elements(sh)) > 0, + Assert(std::get<0>(count_elements(sh)) > 0, ExcMessage("NormalToMeshProjectionBoundary needs a shape containing faces to operate.")); } @@ -172,12 +172,12 @@ namespace OpenCASCADE { for (unsigned int i=0; i, Tensor<1,3>, double, double> + std::tuple, Tensor<1,3>, double, double> p_and_diff_forms = closest_point_and_differential_forms(sh, surrounding_points[i], tolerance); - average_normal += std_cxx11::get<1>(p_and_diff_forms); + average_normal += std::get<1>(p_and_diff_forms); } average_normal/=2.0; @@ -333,13 +333,13 @@ namespace OpenCASCADE } template<> - std_cxx11::tuple + std::tuple NURBSPatchManifold<2, 3>:: get_uv_bounds() const { Standard_Real umin, umax, vmin, vmax; BRepTools::UVBounds(face, umin, umax, vmin, vmax); - return std_cxx11::make_tuple(umin, umax, vmin, vmax); + return std::make_tuple(umin, umax, vmin, vmax); } // Explicit instantiations diff --git a/source/opencascade/utilities.cc b/source/opencascade/utilities.cc index 0e97c3fc12..a5cc591db7 100644 --- a/source/opencascade/utilities.cc +++ b/source/opencascade/utilities.cc @@ -89,7 +89,7 @@ DEAL_II_NAMESPACE_OPEN namespace OpenCASCADE { - std_cxx11::tuple + std::tuple count_elements(const TopoDS_Shape &shape) { TopExp_Explorer exp; @@ -103,7 +103,7 @@ namespace OpenCASCADE for (exp.Init(shape, TopAbs_VERTEX); exp.More(); exp.Next(), ++n_vertices) {} - return std_cxx11::tuple(n_faces, n_edges, n_vertices); + return std::tuple(n_faces, n_edges, n_vertices); } void extract_geometrical_shapes(const TopoDS_Shape &shape, @@ -460,7 +460,7 @@ namespace OpenCASCADE return out_shape; } - std_cxx11::tuple, TopoDS_Shape, double, double> + std::tuple, TopoDS_Shape, double, double> project_point_and_pull_back(const TopoDS_Shape &in_shape, const Point<3> &origin, const double tolerance) @@ -536,7 +536,7 @@ namespace OpenCASCADE } Assert(counter > 0, ExcMessage("Could not find projection points.")); - return std_cxx11::tuple, TopoDS_Shape, double, double> + return std::tuple, TopoDS_Shape, double, double> (point(Pproj),out_shape, u, v); } @@ -545,35 +545,35 @@ namespace OpenCASCADE const Point<3> &origin, const double tolerance) { - std_cxx11::tuple, TopoDS_Shape, double, double> + std::tuple, TopoDS_Shape, double, double> ref = project_point_and_pull_back(in_shape, origin, tolerance); - return std_cxx11::get<0>(ref); + return std::get<0>(ref); } - std_cxx11::tuple, Tensor<1,3>, double, double> + std::tuple, Tensor<1,3>, double, double> closest_point_and_differential_forms(const TopoDS_Shape &in_shape, const Point<3> &origin, const double tolerance) { - std_cxx11::tuple, TopoDS_Shape, double, double> + std::tuple, TopoDS_Shape, double, double> shape_and_params = project_point_and_pull_back(in_shape, origin, tolerance); - TopoDS_Shape &out_shape = std_cxx11::get<1>(shape_and_params); - double &u = std_cxx11::get<2>(shape_and_params); - double &v = std_cxx11::get<3>(shape_and_params); + TopoDS_Shape &out_shape = std::get<1>(shape_and_params); + double &u = std::get<2>(shape_and_params); + double &v = std::get<3>(shape_and_params); // just a check here: the number of faces in out_shape must be 1, otherwise // something is wrong - std_cxx11::tuple numbers = + std::tuple numbers = count_elements(out_shape); (void)numbers; - Assert(std_cxx11::get<0>(numbers) > 0, + Assert(std::get<0>(numbers) > 0, ExcMessage("Could not find normal: the shape containing the closest point has 0 faces.")); - Assert(std_cxx11::get<0>(numbers) < 2, + Assert(std::get<0>(numbers) < 2, ExcMessage("Could not find normal: the shape containing the closest point has more than 1 face.")); @@ -605,7 +605,7 @@ namespace OpenCASCADE return Point<3>(); } - std_cxx11::tuple, Tensor<1,3>, double, double> + std::tuple, Tensor<1,3>, double, double> push_forward_and_differential_forms(const TopoDS_Face &face, const double u, const double v, @@ -632,7 +632,7 @@ namespace OpenCASCADE Max_Curvature *= -1; } - return std_cxx11::tuple, Tensor<1,3>, double, double>(point(Value), normal, Min_Curvature, Max_Curvature); + return std::tuple, Tensor<1,3>, double, double>(point(Value), normal, Min_Curvature, Max_Curvature); } diff --git a/tests/arpack/step-36_parpack_mf.cc b/tests/arpack/step-36_parpack_mf.cc index d882f4239f..3405ee3e8b 100644 --- a/tests/arpack/step-36_parpack_mf.cc +++ b/tests/arpack/step-36_parpack_mf.cc @@ -91,7 +91,7 @@ void test () constraints); constraints.close (); - std_cxx11::shared_ptr > mf_data(new MatrixFree ()); + std::shared_ptr > mf_data(new MatrixFree ()); { const QGauss<1> quad (fe_degree+1); typename MatrixFree::AdditionalData data; diff --git a/tests/base/data_out_base.cc b/tests/base/data_out_base.cc index fc814283cd..fe4e03fe4d 100644 --- a/tests/base/data_out_base.cc +++ b/tests/base/data_out_base.cc @@ -47,7 +47,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 4cff6eac08..d5b7aee545 100644 --- a/tests/base/data_out_base_dx.cc +++ b/tests/base/data_out_base_dx.cc @@ -50,7 +50,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); } @@ -68,7 +68,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 e82c4dc859..7ead9c17f2 100644 --- a/tests/base/data_out_base_eps.cc +++ b/tests/base/data_out_base_eps.cc @@ -49,7 +49,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); } @@ -66,7 +66,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 42d1f8d0be..9479f0cf66 100644 --- a/tests/base/data_out_base_gmv.cc +++ b/tests/base/data_out_base_gmv.cc @@ -48,7 +48,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 4f38fc902e..88bb86d16e 100644 --- a/tests/base/data_out_base_gnuplot.cc +++ b/tests/base/data_out_base_gnuplot.cc @@ -47,7 +47,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_gnuplot_labels.cc b/tests/base/data_out_base_gnuplot_labels.cc index 7e135f020a..f82745fc3a 100644 --- a/tests/base/data_out_base_gnuplot_labels.cc +++ b/tests/base/data_out_base_gnuplot_labels.cc @@ -52,7 +52,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 c585afaa0f..b357b234cd 100644 --- a/tests/base/data_out_base_povray.cc +++ b/tests/base/data_out_base_povray.cc @@ -49,7 +49,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); } @@ -66,7 +66,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 299b6ab1c3..9cf01272c8 100644 --- a/tests/base/data_out_base_tecplot.cc +++ b/tests/base/data_out_base_tecplot.cc @@ -48,7 +48,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 4ea58ce949..24156a65be 100644 --- a/tests/base/data_out_base_tecplot_bin.cc +++ b/tests/base/data_out_base_tecplot_bin.cc @@ -45,7 +45,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 da67a3e3df..75b8904045 100644 --- a/tests/base/data_out_base_vtk.cc +++ b/tests/base/data_out_base_vtk.cc @@ -48,7 +48,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 58d796d405..25bb64cf37 100644 --- a/tests/base/data_out_base_vtk_cycle.cc +++ b/tests/base/data_out_base_vtk_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_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 3119266a9b..a2989f7b29 100644 --- a/tests/base/data_out_base_vtk_time.cc +++ b/tests/base/data_out_base_vtk_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_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 2009377ede..99bd333bd0 100644 --- a/tests/base/data_out_base_vtk_time_and_cycle.cc +++ b/tests/base/data_out_base_vtk_time_and_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_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 703861aeb7..52f4e64aa8 100644 --- a/tests/base/data_out_base_vtu.cc +++ b/tests/base/data_out_base_vtu.cc @@ -48,7 +48,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_compression_levels.cc b/tests/base/data_out_base_vtu_compression_levels.cc index 1cb302beb5..c2cd7a9546 100644 --- a/tests/base/data_out_base_vtu_compression_levels.cc +++ b/tests/base/data_out_base_vtu_compression_levels.cc @@ -42,7 +42,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 1720d66a57..d0ff491e86 100644 --- a/tests/base/data_out_base_vtu_cycle.cc +++ b/tests/base/data_out_base_vtu_cycle.cc @@ -50,7 +50,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 e292cb13ed..f46e7232f3 100644 --- a/tests/base/data_out_base_vtu_time.cc +++ b/tests/base/data_out_base_vtu_time.cc @@ -50,7 +50,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 ab2bd5fd87..b481874a90 100644 --- a/tests/base/data_out_base_vtu_time_and_cycle.cc +++ b/tests/base/data_out_base_vtu_time_and_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_reader_01.cc b/tests/base/data_out_reader_01.cc index 886bf208a5..838df2411c 100644 --- a/tests/base/data_out_reader_01.cc +++ b/tests/base/data_out_reader_01.cc @@ -42,7 +42,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 d103cda19e..b79460fabb 100644 --- a/tests/base/function_parser_04.cc +++ b/tests/base/function_parser_04.cc @@ -77,9 +77,9 @@ void test2() WorkStream::run(v.begin(), v.end(), &assemble, - std_cxx11::bind(©, - std_cxx11::ref(result), - std_cxx11::_1), + std::bind(©, + std::ref(result), + std::placeholders::_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 8260be9a38..c93d0a1ac1 100644 --- a/tests/base/functions_04.cc +++ b/tests/base/functions_04.cc @@ -184,7 +184,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 3102ab827b..86b9329101 100644 --- a/tests/base/functions_05.cc +++ b/tests/base/functions_05.cc @@ -48,9 +48,9 @@ void check2 () q[d] = d; ScalarFunctionFromFunctionObject - object (std_cxx11::bind (&Point::distance, - q, - std_cxx11::_1)); + object (std::bind (&Point::distance, + q, + std::placeholders::_1)); for (unsigned int i=0; i<10; ++i) { diff --git a/tests/base/functions_06.cc b/tests/base/functions_06.cc index d2693a3fd6..d5d9fc67ce 100644 --- a/tests/base/functions_06.cc +++ b/tests/base/functions_06.cc @@ -58,9 +58,9 @@ void check2 () q[d] = d; ScalarFunctionFromFunctionObject - object (std_cxx11::bind (&Point::distance, - q, - std_cxx11::_1)); + object (std::bind (&Point::distance, + q, + std::placeholders::_1)); for (unsigned int i=0; i<10; ++i) { diff --git a/tests/base/functions_10.cc b/tests/base/functions_10.cc index 0044c29faa..1d1d6c5d32 100644 --- a/tests/base/functions_10.cc +++ b/tests/base/functions_10.cc @@ -22,7 +22,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_cxx11::array,1> &coordinates) +Table<1,double> fill (const std::array,1> &coordinates) { Table<1,double> data(coordinates[0].size()); for (unsigned int i=0; i fill (const std_cxx11::array,1> &coordinates return data; } -Table<2,double> fill (const std_cxx11::array,2> &coordinates) +Table<2,double> fill (const std::array,2> &coordinates) { Table<2,double> data(coordinates[0].size(), coordinates[1].size()); @@ -40,7 +40,7 @@ Table<2,double> fill (const std_cxx11::array,2> &coordinates return data; } -Table<3,double> fill (const std_cxx11::array,3> &coordinates) +Table<3,double> fill (const std::array,3> &coordinates) { Table<3,double> data(coordinates[0].size(), coordinates[1].size(), @@ -60,7 +60,7 @@ void check () { // have coordinate arrays that span an interval starting at d+1 // d+5 nonuniform intervals - std_cxx11::array,dim> coordinates; + std::array,dim> coordinates; for (unsigned int d=0; d fill (const std_cxx11::array,1> &coordinates) +Table<1,double> fill (const std::array,1> &coordinates) { Table<1,double> data(coordinates[0].size()); for (unsigned int i=0; i fill (const std_cxx11::array,1> &coordinates return data; } -Table<2,double> fill (const std_cxx11::array,2> &coordinates) +Table<2,double> fill (const std::array,2> &coordinates) { Table<2,double> data(coordinates[0].size(), coordinates[1].size()); @@ -40,7 +40,7 @@ Table<2,double> fill (const std_cxx11::array,2> &coordinates return data; } -Table<3,double> fill (const std_cxx11::array,3> &coordinates) +Table<3,double> fill (const std::array,3> &coordinates) { Table<3,double> data(coordinates[0].size(), coordinates[1].size(), @@ -60,15 +60,15 @@ void check () { // have coordinate arrays that span an interval starting at d+1 // d+5 nonuniform intervals - std_cxx11::array,dim> intervals; - std_cxx11::array n_subintervals; + std::array,dim> intervals; + std::array n_subintervals; for (unsigned int d=0; d,dim> coordinates; + std::array,dim> coordinates; for (unsigned int d=0; d #include -#include +#include #include #define MAX_DIM 3 diff --git a/tests/base/functions_singularity.cc b/tests/base/functions_singularity.cc index 045c344f26..bc0cc8698a 100644 --- a/tests/base/functions_singularity.cc +++ b/tests/base/functions_singularity.cc @@ -224,7 +224,7 @@ check_function_derivative(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_spherical_01.cc b/tests/base/functions_spherical_01.cc index 8e4cf8768c..a258d02270 100644 --- a/tests/base/functions_spherical_01.cc +++ b/tests/base/functions_spherical_01.cc @@ -86,26 +86,26 @@ public: {} private: - virtual double svalue(const std_cxx11::array &sp, + virtual double svalue(const std::array &sp, const unsigned int) const { return std::exp(-Z*sp[0]); } - virtual std_cxx11::array sgradient(const std_cxx11::array &sp, - const unsigned int) const + virtual std::array sgradient(const std::array &sp, + const unsigned int) const { - std_cxx11::array res; + std::array res; res[0] = -Z*std::exp(-Z*sp[0]); for (unsigned int i=1; i < dim; i++) res[i] = 0.; return res; } - virtual std_cxx11::array shessian (const std_cxx11::array &sp, - const unsigned int) const + virtual std::array shessian (const std::array &sp, + const unsigned int) const { - std_cxx11::array res; + std::array res; res[0] = Z*Z*std::exp(-Z*sp[0]); for (unsigned int i=1; i < 6; i++) res[i] = 0.; @@ -131,7 +131,7 @@ void check() for (double theta = 0; theta < 2*numbers::PI; theta+= numbers::PI/3.) for (double phi = 0.01; phi <= numbers::PI; phi+= numbers::PI/4.) { - std_cxx11::array sp; + std::array sp; sp[0] = r; sp[1] = theta; sp[2] = phi; diff --git a/tests/base/functions_spherical_02.cc b/tests/base/functions_spherical_02.cc index b5f01ba1c8..e4f43e3027 100644 --- a/tests/base/functions_spherical_02.cc +++ b/tests/base/functions_spherical_02.cc @@ -128,16 +128,16 @@ public: {} private: - virtual double svalue(const std_cxx11::array &sp, + virtual double svalue(const std::array &sp, const unsigned int) const { return sp[0]*sp[0]*std::cos(sp[1])*std::sin(sp[2]); } - virtual std_cxx11::array sgradient(const std_cxx11::array &sp, - const unsigned int) const + virtual std::array sgradient(const std::array &sp, + const unsigned int) const { - std_cxx11::array res; + std::array res; const double r = sp[0]; const double theta = sp[1]; const double phi = sp[2]; @@ -147,10 +147,10 @@ private: return res; } - virtual std_cxx11::array shessian (const std_cxx11::array &sp, - const unsigned int) const + virtual std::array shessian (const std::array &sp, + const unsigned int) const { - std_cxx11::array res; + std::array res; const double r = sp[0]; const double theta = sp[1]; const double phi = sp[2]; @@ -180,7 +180,7 @@ void check() for (double theta = 0; theta < 2*numbers::PI; theta+= numbers::PI/3.) for (double phi = 0.01; phi <= numbers::PI; phi+= numbers::PI/4.) { - std_cxx11::array sp; + std::array sp; sp[0] = r; sp[1] = theta; sp[2] = phi; diff --git a/tests/base/geometric_utilities_01.cc b/tests/base/geometric_utilities_01.cc index abdbd90375..d53035e79c 100644 --- a/tests/base/geometric_utilities_01.cc +++ b/tests/base/geometric_utilities_01.cc @@ -49,7 +49,7 @@ void test () const Point origin; - std_cxx1x::array sorigin; + std::array sorigin; for (unsigned int d= 0; d < dim; d++) sorigin[d] = 0.; @@ -57,7 +57,7 @@ void test () for (unsigned int d=0; d< dim; d++) one[d] = 1.; - std_cxx1x::array sone; + std::array sone; sone[0] = std::sqrt(1.*dim); sone[1] = numbers::PI/4; if (dim==3) @@ -76,15 +76,15 @@ void test3d() const dealii::Point<3> y(0,1,0); const dealii::Point<3> z(0,0,1); - std_cxx1x::array sx; + std::array sx; sx[0] = 1.; sx[1] = 0; sx[2] = numbers::PI/2; - std_cxx1x::array sy; + std::array sy; sy[0] = 1; sy[1] = numbers::PI/2; sy[2] = numbers::PI/2; - std_cxx1x::array sz; + std::array sz; sz[0] = 1.; sz[1] = 0.; sz[2] = 0.; @@ -98,7 +98,7 @@ void test3d() print<3>(to_spherical(z),sz); const Point<3> dateline(0,-1,0); - std_cxx1x::array sdateline; + std::array sdateline; sdateline[0] = 1.; sdateline[1] = 3*numbers::PI/2; sdateline[2] = numbers::PI/2; diff --git a/tests/base/geometric_utilities_02.cc b/tests/base/geometric_utilities_02.cc index da552fbf2a..3b4fe5fcb3 100644 --- a/tests/base/geometric_utilities_02.cc +++ b/tests/base/geometric_utilities_02.cc @@ -42,12 +42,12 @@ void test () // have one-to-one correspondence for (double phi = 0.01; phi <= numbers::PI; phi+= numbers::PI/4.) { - std_cxx11::array sp; + std::array sp; sp[0] = r; sp[1] = theta; sp[2] = phi; Point p = GeometricUtilities::Coordinates::from_spherical(sp); - const std_cxx11::array sp2 = GeometricUtilities::Coordinates::to_spherical(p); + const std::array sp2 = GeometricUtilities::Coordinates::to_spherical(p); for (unsigned int i = 0; i ::active_cell_iterator cell(dof_handler.begin_active()); std::vector::active_cell_iterator> > coloring( GraphColoring::make_graph_coloring(cell,dof_handler.end(), - std_cxx11::function (typename + std::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 83e1529f32..2f3a4b5c49 100644 --- a/tests/base/graph_coloring_02.cc +++ b/tests/base/graph_coloring_02.cc @@ -67,7 +67,7 @@ void check() // Create the coloring std::vector::active_cell_iterator> > coloring( GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(), - std_cxx11::function (typename + std::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 3ab6130007..e471dbe9b7 100644 --- a/tests/base/graph_coloring_02a.cc +++ b/tests/base/graph_coloring_02a.cc @@ -71,7 +71,7 @@ void check() // Create the coloring std::vector::active_cell_iterator> > coloring( GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(), - std_cxx11::function (typename + std::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 50d643cea2..7c57008b4b 100644 --- a/tests/base/graph_coloring_03.cc +++ b/tests/base/graph_coloring_03.cc @@ -69,7 +69,7 @@ void check() // Create the coloring std::vector::active_cell_iterator> > coloring( GraphColoring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(), - std_cxx11::function (typename + std::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 11b381a321..6b4d4dc067 100644 --- a/tests/base/graph_coloring_04.cc +++ b/tests/base/graph_coloring_04.cc @@ -81,7 +81,7 @@ void check () std::vector::active_cell_iterator> > coloring = GraphColoring::make_graph_coloring(stokes_dof_handler.begin_active(), stokes_dof_handler.end(), - std_cxx11::function ( + std::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_cxx11::function (typename + std::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 80ad06e051..211aa84c6f 100644 --- a/tests/base/graph_coloring_06.cc +++ b/tests/base/graph_coloring_06.cc @@ -75,7 +75,7 @@ void check() coloring = GraphColoring::make_graph_coloring(dof_handler.begin_active(), dof_handler.end(), - std_cxx11::function + std::function (typename DoFHandler::active_cell_iterator const &)> (&get_conflict_indices_cfem)); diff --git a/tests/base/memory_consumption_03.cc b/tests/base/memory_consumption_03.cc index 1965b74818..eb8a5a3a7a 100644 --- a/tests/base/memory_consumption_03.cc +++ b/tests/base/memory_consumption_03.cc @@ -15,7 +15,7 @@ -// test memory_consumption() on std_cxx11::array +// test memory_consumption() on std::array #include "../tests.h" @@ -29,7 +29,7 @@ int main() std::ofstream logfile("output"); deallog.attach(logfile); - typedef std_cxx11::array, 3> IntArray; + typedef std::array, 3> IntArray; deallog << dealii::MemoryConsumption::memory_consumption(IntArray()) << std::endl; deallog << sizeof(IntArray) << std::endl; } diff --git a/tests/base/time_stepping_01.cc b/tests/base/time_stepping_01.cc index e36f4dc62e..85ee21317d 100644 --- a/tests/base/time_stepping_01.cc +++ b/tests/base/time_stepping_01.cc @@ -115,9 +115,9 @@ double my5(double const t) } void test(TimeStepping::RungeKutta > &solver, - 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) + std::function (double const, Vector const &)> f, + std::function (double const, double const, Vector const &)> id_minus_tau_J_inv, + std::function my) { unsigned int n_time_steps = 1; unsigned int size = 1; @@ -142,9 +142,9 @@ void test(TimeStepping::RungeKutta > &solver, } void test2(TimeStepping::EmbeddedExplicitRungeKutta > &solver, - 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) + std::function (double const, Vector const &)> f, + std::function (double const, double const, Vector const &)> id_minus_tau_J_inv, + std::function my) { double initial_time = 0.0, final_time = 1.0; double time_step = 1.0; diff --git a/tests/base/time_stepping_02.cc b/tests/base/time_stepping_02.cc index 500fe0d6ef..7c577f500d 100644 --- a/tests/base/time_stepping_02.cc +++ b/tests/base/time_stepping_02.cc @@ -36,8 +36,8 @@ double my(double const t) } void test(TimeStepping::EmbeddedExplicitRungeKutta > &solver, - std_cxx11::function (double const, Vector const &)> f, - std_cxx11::function my) + std::function (double const, Vector const &)> f, + std::function my) { double initial_time = 0.0, final_time = 1.0; double time_step = 0.1; diff --git a/tests/base/unique_ptr_01.cc b/tests/base/unique_ptr_01.cc index 06f9b6d745..af5ed55fdb 100644 --- a/tests/base/unique_ptr_01.cc +++ b/tests/base/unique_ptr_01.cc @@ -16,7 +16,7 @@ #include "../tests.h" -#include +#include #include #include @@ -64,7 +64,7 @@ int main () { AssertThrow (counter == 0, ExcInternalError()); { - std_cxx11::unique_ptr p (new X); + std::unique_ptr p (new X); AssertThrow (counter == 1, ExcInternalError()); } AssertThrow (counter == 0, ExcInternalError()); @@ -76,10 +76,10 @@ int main () { AssertThrow (counter == 0, ExcInternalError()); { - std_cxx11::unique_ptr p (new X); + std::unique_ptr p (new X); AssertThrow (counter == 1, ExcInternalError()); - std_cxx11::unique_ptr q = std::move(p); + std::unique_ptr q = std::move(p); AssertThrow (counter == 1, ExcInternalError()); } AssertThrow (counter == 0, ExcInternalError()); diff --git a/tests/base/work_stream_03.cc b/tests/base/work_stream_03.cc index cb58698c50..300511b0dd 100644 --- a/tests/base/work_stream_03.cc +++ b/tests/base/work_stream_03.cc @@ -112,8 +112,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_cxx11::bind(&zero_subrange, std_cxx11::_1, std_cxx11::_2, - std_cxx11::ref(copy_data.cell_rhs)), 1); + std::bind(&zero_subrange, std::placeholders::_1, std::placeholders::_2, + std::ref(copy_data.cell_rhs)), 1); AssertThrow(q == data.x_fe_values.quadrature_point(0), ExcInternalError()); @@ -151,7 +151,7 @@ do_project() copy_data.cell_rhs.resize(8); WorkStream::run(triangulation.begin_active(), triangulation.end(), &mass_assembler, - std_cxx11::bind(©_local_to_global, std_cxx11::_1, &sum), + std::bind(©_local_to_global, std::placeholders::_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 ccc4e63368..399c83300c 100644 --- a/tests/base/work_stream_03_graph.cc +++ b/tests/base/work_stream_03_graph.cc @@ -109,8 +109,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_cxx11::bind(&zero_subrange, std_cxx11::_1, std_cxx11::_2, - std_cxx11::ref(copy_data.cell_rhs)), 1); + std::bind(&zero_subrange, std::placeholders::_1, std::placeholders::_2, + std::ref(copy_data.cell_rhs)), 1); AssertThrow(q == data.x_fe_values.quadrature_point(0), ExcInternalError()); @@ -158,11 +158,11 @@ do_project() copy_data.cell_rhs.resize(8); WorkStream::run(GraphColoring::make_graph_coloring (triangulation.begin_active(), triangulation.end(), - std_cxx11::function + std::function (const Triangulation::active_cell_iterator &)> (&conflictor)), &mass_assembler, - std_cxx11::bind(©_local_to_global, std_cxx11::_1, &sum), + std::bind(©_local_to_global, std::placeholders::_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 5274ba241d..71f520f575 100644 --- a/tests/base/work_stream_04.cc +++ b/tests/base/work_stream_04.cc @@ -48,14 +48,14 @@ void test () // first run with only a worker WorkStream::run (v.begin(), v.end(), &foo, - std_cxx11::function(), + std::function(), ScratchData(), 0U); // next run with only a copier WorkStream::run (v.begin(), v.end(), - std_cxx11::function::iterator, - ScratchData &,unsigned int &)>(), + std::function::iterator, + ScratchData &,unsigned int &)>(), &bar, ScratchData(), 0U); diff --git a/tests/base/work_stream_05_graph.cc b/tests/base/work_stream_05_graph.cc index 47b0e06e35..7bf54ba68b 100644 --- a/tests/base/work_stream_05_graph.cc +++ b/tests/base/work_stream_05_graph.cc @@ -75,7 +75,7 @@ void test () v.push_back (i); WorkStream::run (GraphColoring::make_graph_coloring (v.begin(), v.end(), - std_cxx11::function + std::function (const std::vector::iterator &)> (&conflictor)), &worker, &copier, diff --git a/tests/bits/fe_tools_05.cc b/tests/bits/fe_tools_05.cc index 15510d07c6..aebbe760f2 100644 --- a/tests/bits/fe_tools_05.cc +++ b/tests/bits/fe_tools_05.cc @@ -44,9 +44,9 @@ check_this (const FiniteElement &fe1, if (!fe2.constraints_are_implemented()) return; - std_cxx11::unique_ptr > tria(make_tria()); - std_cxx11::unique_ptr > dof1(make_dof_handler (*tria, fe1)); - std_cxx11::unique_ptr > dof2(make_dof_handler (*tria, fe2)); + std::unique_ptr > tria(make_tria()); + std::unique_ptr > dof1(make_dof_handler (*tria, fe1)); + std::unique_ptr > dof2(make_dof_handler (*tria, fe2)); ConstraintMatrix cm; DoFTools::make_hanging_node_constraints (*dof2, cm); cm.close (); diff --git a/tests/bits/fe_tools_06.cc b/tests/bits/fe_tools_06.cc index 4b5e26abae..b26e1e8cd3 100644 --- a/tests/bits/fe_tools_06.cc +++ b/tests/bits/fe_tools_06.cc @@ -46,9 +46,9 @@ check_this (const FiniteElement &fe1, !fe2.constraints_are_implemented()) return; - std_cxx11::unique_ptr > tria(make_tria()); - std_cxx11::unique_ptr > dof1(make_dof_handler (*tria, fe1)); - std_cxx11::unique_ptr > dof2(make_dof_handler (*tria, fe2)); + std::unique_ptr > tria(make_tria()); + std::unique_ptr > dof1(make_dof_handler (*tria, fe1)); + std::unique_ptr > dof2(make_dof_handler (*tria, fe2)); ConstraintMatrix cm1, cm2; DoFTools::make_hanging_node_constraints (*dof1, cm1); DoFTools::make_hanging_node_constraints (*dof2, cm2); diff --git a/tests/bits/fe_tools_06b.cc b/tests/bits/fe_tools_06b.cc index 58e443a1a4..acd7a1bdec 100644 --- a/tests/bits/fe_tools_06b.cc +++ b/tests/bits/fe_tools_06b.cc @@ -47,9 +47,9 @@ check_this (const FiniteElement &fe1, !fe2.constraints_are_implemented()) return; - std_cxx11::unique_ptr > tria(make_tria()); - std_cxx11::unique_ptr > dof1(make_dof_handler (*tria, fe1)); - std_cxx11::unique_ptr > dof2(make_dof_handler (*tria, fe2)); + std::unique_ptr > tria(make_tria()); + std::unique_ptr > dof1(make_dof_handler (*tria, fe1)); + std::unique_ptr > dof2(make_dof_handler (*tria, fe2)); ConstraintMatrix cm1, cm2; DoFTools::make_hanging_node_constraints (*dof1, cm1); DoFTools::make_hanging_node_constraints (*dof2, cm2); diff --git a/tests/bits/fe_tools_06c.cc b/tests/bits/fe_tools_06c.cc index 46ab7d402f..1d9d47cd24 100644 --- a/tests/bits/fe_tools_06c.cc +++ b/tests/bits/fe_tools_06c.cc @@ -49,7 +49,7 @@ check_this (const FiniteElement &fe1, GridGenerator::hyper_cube(tria, 0., 1.); tria.refine_global (2); - std_cxx11::unique_ptr > dof1(make_dof_handler (tria, fe1)); + std::unique_ptr > dof1(make_dof_handler (tria, fe1)); Vector in (dof1->n_dofs()); for (unsigned int i=0; i &fe1, tria.refine_global (2); hp::FECollection hp_fe1(fe1); - std_cxx11::unique_ptr > hp_dof1(make_hp_dof_handler (tria, hp_fe1)); + std::unique_ptr > hp_dof1(make_hp_dof_handler (tria, hp_fe1)); Vector in (hp_dof1->n_dofs()); for (unsigned int i=0; i &fe1, !fe2.constraints_are_implemented()) return; - std_cxx11::unique_ptr > tria(make_tria()); - std_cxx11::unique_ptr > dof1(make_dof_handler (*tria, fe1)); - std_cxx11::unique_ptr > dof2(make_dof_handler (*tria, fe2)); + std::unique_ptr > tria(make_tria()); + std::unique_ptr > dof1(make_dof_handler (*tria, fe1)); + std::unique_ptr > dof2(make_dof_handler (*tria, fe2)); ConstraintMatrix cm1, cm2; DoFTools::make_hanging_node_constraints (*dof1, cm1); DoFTools::make_hanging_node_constraints (*dof2, cm2); diff --git a/tests/bits/fe_tools_08.cc b/tests/bits/fe_tools_08.cc index 442ff0809e..63e935c970 100644 --- a/tests/bits/fe_tools_08.cc +++ b/tests/bits/fe_tools_08.cc @@ -50,9 +50,9 @@ check_this (const FiniteElement &fe1, if (!fe2.isotropic_restriction_is_implemented()) return; - std_cxx11::unique_ptr > tria(make_tria()); - std_cxx11::unique_ptr > dof1(make_dof_handler (*tria, fe1)); - std_cxx11::unique_ptr > dof2(make_dof_handler (*tria, fe2)); + std::unique_ptr > tria(make_tria()); + std::unique_ptr > dof1(make_dof_handler (*tria, fe1)); + std::unique_ptr > dof2(make_dof_handler (*tria, fe2)); ConstraintMatrix cm; DoFTools::make_hanging_node_constraints (*dof2, cm); cm.close (); diff --git a/tests/bits/fe_tools_common.h b/tests/bits/fe_tools_common.h index 8fc0703904..fe54f858c0 100644 --- a/tests/bits/fe_tools_common.h +++ b/tests/bits/fe_tools_common.h @@ -18,7 +18,6 @@ #include "../tests.h" #include -#include #include #include #include @@ -37,6 +36,7 @@ #include #include #include +#include #include diff --git a/tests/bits/step-51.cc b/tests/bits/step-51.cc index 323d1686ce..434d5e578e 100644 --- a/tests/bits/step-51.cc +++ b/tests/bits/step-51.cc @@ -795,10 +795,10 @@ namespace Step51 WorkStream::run(dof_handler_u_post.begin_active(), dof_handler_u_post.end(), - std_cxx11::bind (&HDG::postprocess_one_cell, - std_cxx11::ref(*this), - std_cxx11::_1, std_cxx11::_2, std_cxx11::_3), - std_cxx11::function(), + std::bind (&HDG::postprocess_one_cell, + std::ref(*this), + std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), + std::function(), scratch, 0U); } diff --git a/tests/bits/step-51p.cc b/tests/bits/step-51p.cc index cb8ebc97bc..f25ac40f7e 100644 --- a/tests/bits/step-51p.cc +++ b/tests/bits/step-51p.cc @@ -793,10 +793,10 @@ namespace Step51 WorkStream::run(dof_handler_u_post.begin_active(), dof_handler_u_post.end(), - std_cxx11::bind (&HDG::postprocess_one_cell, - std_cxx11::ref(*this), - std_cxx11::_1, std_cxx11::_2, std_cxx11::_3), - std_cxx11::function(), + std::bind (&HDG::postprocess_one_cell, + std::ref(*this), + std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), + std::function(), scratch, 0U); } diff --git a/tests/dofs/dof_renumbering_02.cc b/tests/dofs/dof_renumbering_02.cc index 49d923c794..8fa2008be5 100644 --- a/tests/dofs/dof_renumbering_02.cc +++ b/tests/dofs/dof_renumbering_02.cc @@ -43,12 +43,12 @@ print_dofs (const DoFHandler &dof) { const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx11::shared_ptr > fevalues; + std::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); + fevalues = std::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); @@ -76,12 +76,12 @@ print_dofs (const DoFHandler &dof, unsigned int level) { const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx11::shared_ptr > fevalues; + std::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); + fevalues = std::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::cell_iterator cell=dof.begin(level); diff --git a/tests/dofs/dof_renumbering_03.cc b/tests/dofs/dof_renumbering_03.cc index ba8956d165..225fd4e5ca 100644 --- a/tests/dofs/dof_renumbering_03.cc +++ b/tests/dofs/dof_renumbering_03.cc @@ -43,12 +43,12 @@ print_dofs (const DoFHandler &dof) { const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx11::shared_ptr > fevalues; + std::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); + fevalues = std::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); diff --git a/tests/dofs/dof_renumbering_04.cc b/tests/dofs/dof_renumbering_04.cc index ef9e9c5f9d..51c71c20a2 100644 --- a/tests/dofs/dof_renumbering_04.cc +++ b/tests/dofs/dof_renumbering_04.cc @@ -43,12 +43,12 @@ print_dofs (const DoFHandler &dof) { const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx11::shared_ptr > fevalues; + std::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); + fevalues = std::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); diff --git a/tests/dofs/dof_renumbering_05.cc b/tests/dofs/dof_renumbering_05.cc index 579d4ac1c2..447272021d 100644 --- a/tests/dofs/dof_renumbering_05.cc +++ b/tests/dofs/dof_renumbering_05.cc @@ -43,12 +43,12 @@ print_dofs (const DoFHandler &dof) { const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx11::shared_ptr > fevalues; + std::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); + fevalues = std::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); diff --git a/tests/dofs/dof_renumbering_06.cc b/tests/dofs/dof_renumbering_06.cc index fd056f2ea1..d555e1562f 100644 --- a/tests/dofs/dof_renumbering_06.cc +++ b/tests/dofs/dof_renumbering_06.cc @@ -43,12 +43,12 @@ print_dofs (const DoFHandler &dof) { const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx11::shared_ptr > fevalues; + std::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); + fevalues = std::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); diff --git a/tests/dofs/dof_renumbering_07.cc b/tests/dofs/dof_renumbering_07.cc index 280c88a5e8..971ecf33ab 100644 --- a/tests/dofs/dof_renumbering_07.cc +++ b/tests/dofs/dof_renumbering_07.cc @@ -43,12 +43,12 @@ print_dofs (const DoFHandler &dof) { const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx11::shared_ptr > fevalues; + std::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); + fevalues = std::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); diff --git a/tests/dofs/dof_renumbering_08.cc b/tests/dofs/dof_renumbering_08.cc index 95b2194920..d475801fc9 100644 --- a/tests/dofs/dof_renumbering_08.cc +++ b/tests/dofs/dof_renumbering_08.cc @@ -43,12 +43,12 @@ print_dofs (const DoFHandler &dof) { const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx11::shared_ptr > fevalues; + std::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); + fevalues = std::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); diff --git a/tests/dofs/dof_renumbering_zorder_01.cc b/tests/dofs/dof_renumbering_zorder_01.cc index 5d1c47d54c..a0028d7e43 100644 --- a/tests/dofs/dof_renumbering_zorder_01.cc +++ b/tests/dofs/dof_renumbering_zorder_01.cc @@ -42,12 +42,12 @@ print_dofs (const DoFHandler &dof, stream &out) { const FiniteElement &fe = dof.get_fe(); std::vector v (fe.dofs_per_cell); - std_cxx11::shared_ptr > fevalues; + std::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); + fevalues = std::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); diff --git a/tests/dofs/dof_renumbering_zorder_02.cc b/tests/dofs/dof_renumbering_zorder_02.cc index 99ed8c3707..af9ce0c490 100644 --- a/tests/dofs/dof_renumbering_zorder_02.cc +++ b/tests/dofs/dof_renumbering_zorder_02.cc @@ -45,12 +45,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_cxx11::shared_ptr > fevalues; + std::shared_ptr > fevalues; if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); + fevalues = std::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); diff --git a/tests/fe/fe_q_dg0.cc b/tests/fe/fe_q_dg0.cc index de61a5d2fe..610a42fd66 100644 --- a/tests/fe/fe_q_dg0.cc +++ b/tests/fe/fe_q_dg0.cc @@ -110,7 +110,7 @@ namespace Step22 BlockVector solution; BlockVector system_rhs; - std_cxx11::shared_ptr::type> + std::shared_ptr::type> A_preconditioner; ConvergenceTable convergence_table; @@ -626,7 +626,7 @@ namespace Step22 } A_preconditioner - = std_cxx11::shared_ptr::type>(new + = std::shared_ptr::type>(new typename InnerPreconditioner::type()); A_preconditioner->initialize (system_matrix.block(0,0), typename diff --git a/tests/fe/fe_values_function_manifold.cc b/tests/fe/fe_values_function_manifold.cc index f277963813..f14d18d66e 100644 --- a/tests/fe/fe_values_function_manifold.cc +++ b/tests/fe/fe_values_function_manifold.cc @@ -3,7 +3,6 @@ #include #include #include -#include #include #include @@ -33,6 +32,7 @@ #include #include #include +#include #include #include @@ -173,10 +173,10 @@ public: }; template -std_cxx11::shared_ptr > +std::shared_ptr > cubic_roof(Triangulation &triangulation) { - std_cxx11::shared_ptr > boundary(new CubicRoofManifold()); + std::shared_ptr > boundary(new CubicRoofManifold()); GridGenerator::hyper_cube(triangulation); triangulation.set_all_manifold_ids(cubic_manifold_id); @@ -196,10 +196,10 @@ public: double run(); protected: - std_cxx11::shared_ptr > manufactured_solution; - std_cxx11::shared_ptr > manufactured_forcing; + std::shared_ptr > manufactured_solution; + std::shared_ptr > manufactured_forcing; - std_cxx11::shared_ptr > boundary_manifold; + std::shared_ptr > boundary_manifold; Triangulation triangulation; FE_Q finite_element; DoFHandler dof_handler; diff --git a/tests/grid/filtered_iterator.cc b/tests/grid/filtered_iterator.cc index c40f7b6fe7..466514094f 100644 --- a/tests/grid/filtered_iterator.cc +++ b/tests/grid/filtered_iterator.cc @@ -140,9 +140,9 @@ void test () bool (*predicate) (const active_cell_iterator, const unsigned int) = &level_equal_to; FilteredIterator - begin (std_cxx11::bind (predicate, std_cxx11::_1, 3), + begin (std::bind (predicate, std::placeholders::_1, 3), tria.begin_active (3)), - end (std_cxx11::bind (predicate, std_cxx11::_1, 3), + end (std::bind (predicate, std::placeholders::_1, 3), tria.end()); Assert (std::distance (begin, end) == @@ -164,15 +164,15 @@ void test () bool (*predicate) (const active_cell_iterator, const unsigned int) = &level_equal_to; - Assert (std::distance (FI(std_cxx11::bind (predicate, std_cxx11::_1, 3)) + Assert (std::distance (FI(std::bind (predicate, std::placeholders::_1, 3)) .set_to_next_positive(tria.begin_active()), - FI(std_cxx11::bind (predicate, std_cxx11::_1, 3), tria.end())) == + FI(std::bind (predicate, std::placeholders::_1, 3), tria.end())) == static_cast(tria.n_active_cells (3)), ExcInternalError()); logfile << "Check 4: " - << (std::distance (FI(std_cxx11::bind (predicate, std_cxx11::_1, 3)) + << (std::distance (FI(std::bind (predicate, std::placeholders::_1, 3)) .set_to_next_positive(tria.begin_active()), - FI(std_cxx11::bind (predicate, std_cxx11::_1, 3), tria.end())) == + FI(std::bind (predicate, std::placeholders::_1, 3), tria.end())) == static_cast(tria.n_active_cells (3)) ? "OK" : "Failed") diff --git a/tests/grid/filtered_iterator_02.cc b/tests/grid/filtered_iterator_02.cc index c3b854ff23..4fdad800e3 100644 --- a/tests/grid/filtered_iterator_02.cc +++ b/tests/grid/filtered_iterator_02.cc @@ -139,9 +139,9 @@ void test () bool (*predicate) (const active_cell_iterator, const unsigned int) = &level_equal_to; FilteredIterator - begin (std_cxx11::bind (predicate, std_cxx11::_1, 3), + begin (std::bind (predicate, std::placeholders::_1, 3), tria.begin_active (3)), - end (std_cxx11::bind(predicate, std_cxx11::_1, 3), + end (std::bind(predicate, std::placeholders::_1, 3), tria.end()); Assert (std::distance (begin, end) == @@ -163,15 +163,15 @@ void test () bool (*predicate) (const active_cell_iterator, const unsigned int) = &level_equal_to; - Assert (std::distance (FI(std_cxx11::bind (predicate, std_cxx11::_1, 3)) + Assert (std::distance (FI(std::bind (predicate, std::placeholders::_1, 3)) .set_to_next_positive(tria.begin_active()), - FI(std_cxx11::bind (predicate, std_cxx11::_1, 3), tria.end())) == + FI(std::bind (predicate, std::placeholders::_1, 3), tria.end())) == static_cast(tria.n_active_cells (3)), ExcInternalError()); logfile << "Check 4: " - << (std::distance (FI(std_cxx11::bind (predicate, std_cxx11::_1, 3)) + << (std::distance (FI(std::bind (predicate, std::placeholders::_1, 3)) .set_to_next_positive(tria.begin_active()), - FI(std_cxx11::bind (predicate, std_cxx11::_1, 3), tria.end())) == + FI(std::bind (predicate, std::placeholders::_1, 3), tria.end())) == static_cast(tria.n_active_cells (3)) ? "OK" : "Failed") diff --git a/tests/grid/grid_parallelepiped_05.cc b/tests/grid/grid_parallelepiped_05.cc index c070110d22..e0c7151d18 100644 --- a/tests/grid/grid_parallelepiped_05.cc +++ b/tests/grid/grid_parallelepiped_05.cc @@ -54,7 +54,7 @@ void check (bool subdivide) for (unsigned int d=0; d,dim> edges; + std::array,dim> edges; switch (dim) { case 1: diff --git a/tests/grid/grid_tools_halo_layer_01.cc b/tests/grid/grid_tools_halo_layer_01.cc index 961b005f1a..8fb54f8187 100644 --- a/tests/grid/grid_tools_halo_layer_01.cc +++ b/tests/grid/grid_tools_halo_layer_01.cc @@ -88,7 +88,7 @@ void test () GridOut().write_vtk (tria, f); } - std_cxx11::function predicate = pred_mat_id; + std::function predicate = pred_mat_id; // Compute a halo layer around material id 2 and set it to material id 3 const std::vector active_halo_layer diff --git a/tests/grid/grid_tools_halo_layer_02.cc b/tests/grid/grid_tools_halo_layer_02.cc index a054e6663f..a90ef2f45a 100644 --- a/tests/grid/grid_tools_halo_layer_02.cc +++ b/tests/grid/grid_tools_halo_layer_02.cc @@ -83,7 +83,7 @@ void test () } // Compute a halo layer around material id 2 and set it to material id 3 - std_cxx11::function predicate + std::function predicate = IteratorFilters::MaterialIdEqualTo(2, true); const std::vector active_halo_layer = GridTools::compute_active_cell_halo_layer(tria, predicate); diff --git a/tests/grid/grid_tools_halo_layer_03.cc b/tests/grid/grid_tools_halo_layer_03.cc index bd7da219e9..b11bcf7a5d 100644 --- a/tests/grid/grid_tools_halo_layer_03.cc +++ b/tests/grid/grid_tools_halo_layer_03.cc @@ -91,7 +91,7 @@ void test () std::set material_ids; material_ids.insert(2); material_ids.insert(3); - std_cxx11::function predicate + std::function predicate = IteratorFilters::MaterialIdEqualTo(material_ids, true); const std::vector active_halo_layer = GridTools::compute_active_cell_halo_layer(tria, predicate); diff --git a/tests/grid/grid_tools_halo_layer_04.cc b/tests/grid/grid_tools_halo_layer_04.cc index 7fdd45ab9f..4c7931890c 100644 --- a/tests/grid/grid_tools_halo_layer_04.cc +++ b/tests/grid/grid_tools_halo_layer_04.cc @@ -114,7 +114,7 @@ void test () } // Compute a halo layer around active fe index 2 and set it to active fe index 3 - std_cxx11::function predicate + std::function predicate = IteratorFilters::ActiveFEIndexEqualTo(2, true); std::vector active_halo_layer = GridTools::compute_active_cell_halo_layer(dof_handler, predicate); diff --git a/tests/grid/grid_tools_halo_layer_05.cc b/tests/grid/grid_tools_halo_layer_05.cc index 2f24712ee7..5a90b7121c 100644 --- a/tests/grid/grid_tools_halo_layer_05.cc +++ b/tests/grid/grid_tools_halo_layer_05.cc @@ -123,7 +123,7 @@ void test () std::set index_set; index_set.insert(2); index_set.insert(3); - std_cxx11::function predicate + std::function predicate = IteratorFilters::ActiveFEIndexEqualTo(index_set, true); std::vector active_halo_layer = GridTools::compute_active_cell_halo_layer(dof_handler, predicate); diff --git a/tests/grid/refinement_listener_02.cc b/tests/grid/refinement_listener_02.cc index 5ceaa11c34..0bc206ad66 100644 --- a/tests/grid/refinement_listener_02.cc +++ b/tests/grid/refinement_listener_02.cc @@ -82,41 +82,41 @@ void test () boost::signals2::connection connections_1[4] = {tria_1.signals.pre_refinement - .connect (std_cxx11::bind (&pre_refinement_notification, - "tria_1", - std_cxx11::cref(tria_1))), + .connect (std::bind (&pre_refinement_notification, + "tria_1", + std::cref(tria_1))), tria_1.signals.post_refinement - .connect (std_cxx11::bind (&post_refinement_notification, - "tria_1", - std_cxx11::cref(tria_1))), + .connect (std::bind (&post_refinement_notification, + "tria_1", + std::cref(tria_1))), tria_1.signals.create - .connect (std_cxx11::bind (&create_notification, - "tria_1", - std_cxx11::cref(tria_1))), + .connect (std::bind (&create_notification, + "tria_1", + std::cref(tria_1))), tria_1.signals.copy - .connect (std_cxx11::bind (©_notification, - "tria_1", - std_cxx11::_1, - std_cxx11::cref(tria_1))) + .connect (std::bind (©_notification, + "tria_1", + std::placeholders::_1, + std::cref(tria_1))) }; boost::signals2::connection connections_2[4] = {tria_2.signals.pre_refinement - .connect (std_cxx11::bind (&pre_refinement_notification, - "tria_2", - std_cxx11::cref(tria_2))), + .connect (std::bind (&pre_refinement_notification, + "tria_2", + std::cref(tria_2))), tria_2.signals.post_refinement - .connect (std_cxx11::bind (&post_refinement_notification, - "tria_2", - std_cxx11::cref(tria_2))), + .connect (std::bind (&post_refinement_notification, + "tria_2", + std::cref(tria_2))), tria_2.signals.create - .connect (std_cxx11::bind (&create_notification, - "tria_2", - std_cxx11::cref(tria_2))), + .connect (std::bind (&create_notification, + "tria_2", + std::cref(tria_2))), tria_2.signals.copy - .connect (std_cxx11::bind (©_notification, - "tria_2", - std_cxx11::_1, - std_cxx11::cref(tria_2))) + .connect (std::bind (©_notification, + "tria_2", + std::placeholders::_1, + std::cref(tria_2))) }; diff --git a/tests/grid/refinement_listener_03.cc b/tests/grid/refinement_listener_03.cc index 3180f2a4f2..2f2b9076bc 100644 --- a/tests/grid/refinement_listener_03.cc +++ b/tests/grid/refinement_listener_03.cc @@ -91,49 +91,49 @@ void test () boost::signals2::connection connections_1[5] = {tria_1.signals.pre_refinement - .connect (std_cxx11::bind (&pre_refinement_notification, - "tria_1", - std_cxx11::cref(tria_1))), + .connect (std::bind (&pre_refinement_notification, + "tria_1", + std::cref(tria_1))), tria_1.signals.post_refinement - .connect (std_cxx11::bind (&post_refinement_notification, - "tria_1", - std_cxx11::cref(tria_1))), + .connect (std::bind (&post_refinement_notification, + "tria_1", + std::cref(tria_1))), tria_1.signals.create - .connect (std_cxx11::bind (&create_notification, - "tria_1", - std_cxx11::cref(tria_1))), + .connect (std::bind (&create_notification, + "tria_1", + std::cref(tria_1))), tria_1.signals.copy - .connect (std_cxx11::bind (©_notification, - "tria_1", - std_cxx11::_1, - std_cxx11::cref(tria_1))), + .connect (std::bind (©_notification, + "tria_1", + std::placeholders::_1, + std::cref(tria_1))), tria_1.signals.any_change - .connect (std_cxx11::bind (&any_change_notification, - "tria_1", - std_cxx11::cref(tria_1))) + .connect (std::bind (&any_change_notification, + "tria_1", + std::cref(tria_1))) }; boost::signals2::connection connections_2[5] = {tria_2.signals.pre_refinement - .connect (std_cxx11::bind (&pre_refinement_notification, - "tria_2", - std_cxx11::cref(tria_2))), + .connect (std::bind (&pre_refinement_notification, + "tria_2", + std::cref(tria_2))), tria_2.signals.post_refinement - .connect (std_cxx11::bind (&post_refinement_notification, - "tria_2", - std_cxx11::cref(tria_2))), + .connect (std::bind (&post_refinement_notification, + "tria_2", + std::cref(tria_2))), tria_2.signals.create - .connect (std_cxx11::bind (&create_notification, - "tria_2", - std_cxx11::cref(tria_2))), + .connect (std::bind (&create_notification, + "tria_2", + std::cref(tria_2))), tria_2.signals.copy - .connect (std_cxx11::bind (©_notification, - "tria_2", - std_cxx11::_1, - std_cxx11::cref(tria_2))), + .connect (std::bind (©_notification, + "tria_2", + std::placeholders::_1, + std::cref(tria_2))), tria_2.signals.any_change - .connect (std_cxx11::bind (&any_change_notification, - "tria_2", - std_cxx11::cref(tria_2))) + .connect (std::bind (&any_change_notification, + "tria_2", + std::cref(tria_2))) }; diff --git a/tests/grid/rotate_01.cc b/tests/grid/rotate_01.cc index 533726c4e2..1b2f4e3a28 100644 --- a/tests/grid/rotate_01.cc +++ b/tests/grid/rotate_01.cc @@ -36,7 +36,7 @@ void test<2,2> () const int spacedim = 2; Triangulation tria; Point origin; - std_cxx11::array,dim> edges; + std::array,dim> edges; edges[0] = Point(2.0, 0.0)-Point(); edges[1] = Point(0.2, 0.8)-Point(); GridGenerator::subdivided_parallelepiped (tria, @@ -54,7 +54,7 @@ void test () { Triangulation tria; Point origin(0.1, 0.2, 0.3); - std_cxx11::array,dim> edges; + std::array,dim> edges; edges[0] = Point(2.0, 0.0, 0.1)-Point(); if (dim>=2) edges[1] = Point(0.2, 0.8, 0.15)-Point(); diff --git a/tests/grid/twisted_parallelepiped_01.cc b/tests/grid/twisted_parallelepiped_01.cc index a6ca2280f4..d0bf2b4e07 100644 --- a/tests/grid/twisted_parallelepiped_01.cc +++ b/tests/grid/twisted_parallelepiped_01.cc @@ -21,9 +21,9 @@ #include #include #include -#include #include +#include #include /* @@ -36,7 +36,7 @@ void check_parallelepiped (std::ofstream &logfile) { // Data structure defining dim coordinates that make up a // parallelepiped. - std_cxx11::array, dim> edges; + std::array, dim> edges; switch (dim) { diff --git a/tests/grid/twisted_parallelepiped_02.cc b/tests/grid/twisted_parallelepiped_02.cc index c8a37f09c0..2f3ce273d3 100644 --- a/tests/grid/twisted_parallelepiped_02.cc +++ b/tests/grid/twisted_parallelepiped_02.cc @@ -21,9 +21,9 @@ #include #include #include -#include #include +#include #include /* @@ -36,7 +36,7 @@ void check_parallelepiped (std::ofstream &logfile) { // Data structure defining dim coordinates that make up a // parallelepiped. - std_cxx11::array, dim> edges; + std::array, dim> edges; switch (dim) { diff --git a/tests/hp/distribute_dofs_linear_time.cc b/tests/hp/distribute_dofs_linear_time.cc index 05ce1d1b3d..e6dd90f9fd 100644 --- a/tests/hp/distribute_dofs_linear_time.cc +++ b/tests/hp/distribute_dofs_linear_time.cc @@ -40,8 +40,8 @@ #include #include -#include -#include +#include +#include #include @@ -57,18 +57,18 @@ static const types::manifold_id straight_manifold_id = 3; * grid: see step-6. */ template -std_cxx11::shared_ptr > +std::shared_ptr > ladutenko_circle(dealii::Triangulation &triangulation, const dealii::Point center = dealii::Point(), const double radius = 1.0); template -std_cxx11::shared_ptr > +std::shared_ptr > ladutenko_circle(Triangulation &triangulation, const Point center, const double radius) { - std_cxx11::shared_ptr > boundary(new SphericalManifold(center)); + std::shared_ptr > boundary(new SphericalManifold(center)); GridGenerator::hyper_ball (triangulation, center, radius); triangulation.set_all_manifold_ids(circular_manifold_id); triangulation.set_manifold (circular_manifold_id, *boundary); @@ -136,7 +136,7 @@ public: const unsigned int n_global_refines; - std_cxx11::shared_ptr > boundary_manifold; + std::shared_ptr > boundary_manifold; Triangulation triangulation; hp::FECollection finite_elements; hp::DoFHandler dof_handler; diff --git a/tests/hp/step-27.cc b/tests/hp/step-27.cc index 7e5a07b69c..3a701c9866 100644 --- a/tests/hp/step-27.cc +++ b/tests/hp/step-27.cc @@ -85,7 +85,7 @@ namespace Step27 hp::QCollection face_quadrature_collection; hp::QCollection fourier_q_collection; - std_cxx11::shared_ptr > fourier; + std::shared_ptr > fourier; std::vector ln_k; Table > fourier_coefficients; @@ -152,9 +152,9 @@ namespace Step27 for (unsigned int i = 0; i < fe_collection.size(); i++) fourier_q_collection.push_back(quadrature); - fourier = std_cxx11::make_shared >(N, - fe_collection, - fourier_q_collection); + fourier = std::make_shared >(N, + fe_collection, + fourier_q_collection); resize(fourier_coefficients,N); } diff --git a/tests/integrators/cells_and_faces_01.cc b/tests/integrators/cells_and_faces_01.cc index 412793fa7a..8d8ce01cb7 100644 --- a/tests/integrators/cells_and_faces_01.cc +++ b/tests/integrators/cells_and_faces_01.cc @@ -21,7 +21,6 @@ #include #include -#include #include #include #include @@ -29,6 +28,7 @@ #include #include +#include #include using namespace dealii; @@ -117,9 +117,9 @@ test_mesh(DoFHandler &mgdofs) MeshWorker::loop, EmptyInfoBox> (dofs.begin_active(), dofs.end(), dof_info, info_box, - 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), + std::bind (&Local::cell, local, std::placeholders::_1, std::placeholders::_2), + std::bind (&Local::bdry, local, std::placeholders::_1, std::placeholders::_2), + std::bind (&Local::face, local, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), assembler, lctrl); deallog << " Results cells"; @@ -139,9 +139,9 @@ test_mesh(DoFHandler &mgdofs) MeshWorker::loop, EmptyInfoBox> (mgdofs.begin_mg(), mgdofs.end_mg(), mg_dof_info, info_box, - 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), + std::bind (&Local::cell, local, std::placeholders::_1, std::placeholders::_2), + std::bind (&Local::bdry, local, std::placeholders::_1, std::placeholders::_2), + std::bind (&Local::face, local, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), assembler, lctrl); deallog << "MGResults cells"; diff --git a/tests/integrators/functional_01.cc b/tests/integrators/functional_01.cc index 3b8a6592d8..1a80d3cd5b 100644 --- a/tests/integrators/functional_01.cc +++ b/tests/integrators/functional_01.cc @@ -21,13 +21,13 @@ #include #include -#include #include #include #include #include #include +#include #include using namespace dealii; @@ -102,9 +102,9 @@ test_mesh(DoFHandler &mgdofs) MeshWorker::loop, EmptyInfoBox> (dofs.begin_active(), dofs.end(), dof_info, info_box, - 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), + std::bind (&Local::cell, local, std::placeholders::_1, std::placeholders::_2), + std::bind (&Local::bdry, local, std::placeholders::_1, std::placeholders::_2), + std::bind (&Local::face, local, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), assembler, lctrl); deallog << " Results"; @@ -117,9 +117,9 @@ test_mesh(DoFHandler &mgdofs) MeshWorker::loop, EmptyInfoBox> (mgdofs.begin_mg(), mgdofs.end_mg(), mg_dof_info, info_box, - 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), + std::bind (&Local::cell, local, std::placeholders::_1, std::placeholders::_2), + std::bind (&Local::bdry, local, std::placeholders::_1, std::placeholders::_2), + std::bind (&Local::face, local, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), assembler, lctrl); deallog << "MGResults"; diff --git a/tests/integrators/mesh_worker_01.cc b/tests/integrators/mesh_worker_01.cc index 117c361605..ca82779f21 100644 --- a/tests/integrators/mesh_worker_01.cc +++ b/tests/integrators/mesh_worker_01.cc @@ -21,7 +21,6 @@ #include #include -#include #include #include #include @@ -32,6 +31,7 @@ #include #include +#include #include using namespace dealii; @@ -151,9 +151,9 @@ test_simple(DoFHandler &mgdofs) MeshWorker::loop, MeshWorker::IntegrationInfoBox > (dofs.begin_active(), dofs.end(), dof_info, info_box, - 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), + std::bind (&Local::cell, local, std::placeholders::_1, std::placeholders::_2), + std::bind (&Local::bdry, local, std::placeholders::_1, std::placeholders::_2), + std::bind (&Local::face, local, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), assembler, lctrl); for (unsigned int i=0; i > > 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))); + std::vector > > fe2; + fe2.push_back(std::shared_ptr >(new FE_DGP<2>(1))); + fe2.push_back(std::shared_ptr >(new FE_Q<2>(1))); for (unsigned int i=0; i > > 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))); + std::vector > > fe2; + fe2.push_back(std::shared_ptr >(new FE_DGP<2>(1))); +// fe2.push_back(std::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_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))); + std::vector > > fe2; + fe2.push_back(std::shared_ptr >(new FE_DGP<2>(0))); + fe2.push_back(std::shared_ptr >(new FESystem<2>(dgp0,3))); + fe2.push_back(std::shared_ptr >(new FESystem<2>(dgp1,2))); + fe2.push_back(std::shared_ptr >(new FESystem<2>(q1,2))); + fe2.push_back(std::shared_ptr >(new FESystem<2>(dgp0,1,q1,1))); +// fe2.push_back(std::shared_ptr >(new FE_Q<2>(1))); for (unsigned int i=0; i #include -#include #include #include #include @@ -33,6 +32,7 @@ #include #include +#include #include using namespace dealii; @@ -255,12 +255,12 @@ namespace Advection MeshWorker::loop, MeshWorker::IntegrationInfoBox > (dof_handler.begin_active(), dof_handler.end(), dof_info, info_box, - 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), + std::bind(&AdvectionProblem::integrate_cell_term, + this, std::placeholders::_1, std::placeholders::_2), + std::bind(&AdvectionProblem::integrate_boundary_term, + this, std::placeholders::_1, std::placeholders::_2), + std::bind(&AdvectionProblem::integrate_face_term, + this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), assembler, lctrl); }//assemble_system diff --git a/tests/integrators/mesh_worker_matrix_01.cc b/tests/integrators/mesh_worker_matrix_01.cc index f87c67f9fc..82cc1f00a8 100644 --- a/tests/integrators/mesh_worker_matrix_01.cc +++ b/tests/integrators/mesh_worker_matrix_01.cc @@ -21,7 +21,6 @@ #include #include -#include #include #include #include @@ -33,6 +32,7 @@ #include #include +#include #include using namespace dealii; @@ -156,9 +156,9 @@ test_simple(DoFHandler &dofs, bool faces) MeshWorker::loop, MeshWorker::IntegrationInfoBox > (dofs.begin_active(), dofs.end(), dof_info, info_box, - 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), + std::bind (&Local::cell, local, std::placeholders::_1, std::placeholders::_2), + std::bind (&Local::bdry, local, std::placeholders::_1, std::placeholders::_2), + std::bind (&Local::face, local, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), assembler, lctrl); //matrix.print_formatted(deallog.get_file_stream(), 0, false, 4); diff --git a/tests/lac/block_vector_iterator.cc b/tests/lac/block_vector_iterator.cc index 1c4fc0a9e6..287f06246f 100644 --- a/tests/lac/block_vector_iterator.cc +++ b/tests/lac/block_vector_iterator.cc @@ -17,7 +17,6 @@ #include "../tests.h" #include -#include #include #include #include @@ -26,6 +25,7 @@ #include #include #include +#include template bool operator == (const BlockVector &v1, @@ -177,9 +177,9 @@ void test () // check std::transform std::transform (v1.begin(), v1.end(), v2.begin(), - std_cxx11::bind (std::multiplies(), - std_cxx11::_1, - 2.0)); + std::bind (std::multiplies(), + std::placeholders::_1, + 2.0)); v2 *= 1./2; deallog << "Check 7: " << (v1 == v2 ? "true" : "false") << std::endl; diff --git a/tests/lac/complex_block_vector_iterator.cc b/tests/lac/complex_block_vector_iterator.cc index 7ccaeb106d..2c9a5063c0 100644 --- a/tests/lac/complex_block_vector_iterator.cc +++ b/tests/lac/complex_block_vector_iterator.cc @@ -17,7 +17,6 @@ #include "../tests.h" #include -#include #include #include #include @@ -26,6 +25,7 @@ #include #include #include +#include template bool operator == (const BlockVector &v1, @@ -177,9 +177,9 @@ void test () // check std::transform std::transform (v1.begin(), v1.end(), v2.begin(), - std_cxx11::bind (std::multiplies >(), - std_cxx11::_1, - 2.0)); + std::bind (std::multiplies >(), + std::placeholders::_1, + 2.0)); v2 *= std::complex(1./2.); deallog << "Check 7: " << (v1 == v2 ? "true" : "false") << std::endl; diff --git a/tests/lac/constraints_block_01.cc b/tests/lac/constraints_block_01.cc index 2d3891b39e..57899d5999 100644 --- a/tests/lac/constraints_block_01.cc +++ b/tests/lac/constraints_block_01.cc @@ -114,8 +114,8 @@ int main () std::string fluid_fe_name = "FESystem[FE_Nothing()^2-FE_Nothing()^2-FE_Q(2)^2-FE_Q(1)-FE_Q(2)^2]"; hp::FECollection fe_collection; - std_cxx11::unique_ptr > solid_fe (FETools::get_fe_by_name(solid_fe_name)); - std_cxx11::unique_ptr > fluid_fe (FETools::get_fe_by_name(fluid_fe_name)); + std::unique_ptr > solid_fe (FETools::get_fe_by_name(solid_fe_name)); + std::unique_ptr > fluid_fe (FETools::get_fe_by_name(fluid_fe_name)); deallog << "Solid FE Space: " << solid_fe->get_name() << std::endl; deallog << "Fluid/Mesh FE Space: " << fluid_fe->get_name() << std::endl; diff --git a/tests/lac/solver_signals.cc b/tests/lac/solver_signals.cc index c106d03b08..8b71d03eac 100644 --- a/tests/lac/solver_signals.cc +++ b/tests/lac/solver_signals.cc @@ -128,30 +128,30 @@ int main() //Attach all possible slots. solver_cg.connect_coefficients_slot(&output_coefficients); solver_cg.connect_condition_number_slot( - std_cxx11::bind(output_double_number,std_cxx11::_1,"Condition number: "),true); + std::bind(output_double_number,std::placeholders::_1,"Condition number: "),true); solver_cg.connect_condition_number_slot( - std_cxx11::bind(output_double_number,std_cxx11::_1,"Final condition number: ")); + std::bind(output_double_number,std::placeholders::_1,"Final condition number: ")); solver_cg.connect_eigenvalues_slot( - std_cxx11::bind(output_eigenvalues,std_cxx11::_1,"Eigenvalues: "),true); + std::bind(output_eigenvalues,std::placeholders::_1,"Eigenvalues: "),true); solver_cg.connect_eigenvalues_slot( - std_cxx11::bind(output_eigenvalues,std_cxx11::_1,"Final Eigenvalues: ")); + std::bind(output_eigenvalues,std::placeholders::_1,"Final Eigenvalues: ")); solver_cg.solve(A,u,f,PreconditionIdentity()); u=0; SolverGMRES<> solver_gmres(solver_control); //Attach all possible slots. solver_gmres.connect_condition_number_slot( - std_cxx11::bind(output_double_number,std_cxx11::_1,"Condition number: "),true); + std::bind(output_double_number,std::placeholders::_1,"Condition number: "),true); solver_gmres.connect_condition_number_slot( - std_cxx11::bind(output_double_number,std_cxx11::_1,"Final condition number: ")); + std::bind(output_double_number,std::placeholders::_1,"Final condition number: ")); solver_gmres.connect_eigenvalues_slot( - std_cxx11::bind(output_eigenvalues >,std_cxx11::_1,"Eigenvalues: "),true); + std::bind(output_eigenvalues >,std::placeholders::_1,"Eigenvalues: "),true); solver_gmres.connect_eigenvalues_slot( - std_cxx11::bind(output_eigenvalues >,std_cxx11::_1,"Final Eigenvalues: ")); + std::bind(output_eigenvalues >,std::placeholders::_1,"Final Eigenvalues: ")); solver_gmres.connect_hessenberg_slot( - std_cxx11::bind(output_hessenberg_matrix,std_cxx11::_1,"Hessenberg matrix: "),false); + std::bind(output_hessenberg_matrix,std::placeholders::_1,"Hessenberg matrix: "),false); solver_gmres.connect_krylov_space_slot( - std_cxx11::bind(output_arnoldi_vectors_norms,std_cxx11::_1,"Arnoldi vectors norms: ")); + std::bind(output_arnoldi_vectors_norms,std::placeholders::_1,"Arnoldi vectors norms: ")); solver_gmres.solve(A,u,f,PreconditionIdentity()); } catch (std::exception &e) diff --git a/tests/lac/vector_operations_parallel_for_start_end.cc b/tests/lac/vector_operations_parallel_for_start_end.cc index 53417dd7a2..f6b83e2373 100644 --- a/tests/lac/vector_operations_parallel_for_start_end.cc +++ b/tests/lac/vector_operations_parallel_for_start_end.cc @@ -34,7 +34,7 @@ void check () { const unsigned int size = 17 + test*1101; - std_cxx11::shared_ptr< ::dealii::parallel::internal::TBBPartitioner> thread_loop_partitioner; + std::shared_ptr< ::dealii::parallel::internal::TBBPartitioner> thread_loop_partitioner; thread_loop_partitioner.reset(new ::dealii::parallel::internal::TBBPartitioner()); Number *val; diff --git a/tests/lac/vector_operations_parallel_reduce_start_end.cc b/tests/lac/vector_operations_parallel_reduce_start_end.cc index 1f097ddd82..93d7461fc8 100644 --- a/tests/lac/vector_operations_parallel_reduce_start_end.cc +++ b/tests/lac/vector_operations_parallel_reduce_start_end.cc @@ -34,7 +34,7 @@ void check () { const unsigned int size = 17 + test*1101; - std_cxx11::shared_ptr< ::dealii::parallel::internal::TBBPartitioner> thread_loop_partitioner; + std::shared_ptr< ::dealii::parallel::internal::TBBPartitioner> thread_loop_partitioner; thread_loop_partitioner.reset(new ::dealii::parallel::internal::TBBPartitioner()); Number *val; diff --git a/tests/manifold/spherical_manifold_02.cc b/tests/manifold/spherical_manifold_02.cc index 7efceef6d7..55fdf61c39 100644 --- a/tests/manifold/spherical_manifold_02.cc +++ b/tests/manifold/spherical_manifold_02.cc @@ -18,7 +18,6 @@ #include "../tests.h" #include -#include #include #include @@ -44,6 +43,7 @@ #include #include +#include #include @@ -109,7 +109,7 @@ void test (MappingEnum::type mapping_name, unsigned int refinements=1) // << " degrees of freedom." // << std::endl; - std_cxx11::shared_ptr > mapping; + std::shared_ptr > mapping; switch (mapping_name) { case MappingEnum::MappingManifold: diff --git a/tests/mappings/mapping_q_convergence.cc b/tests/mappings/mapping_q_convergence.cc index ac7d4aa6de..2ba98f4244 100644 --- a/tests/mappings/mapping_q_convergence.cc +++ b/tests/mappings/mapping_q_convergence.cc @@ -167,9 +167,9 @@ template void create_tria(Triangulation &triangulation, const Geometry &geometry) { GridGenerator::hyper_cube (triangulation, -1.0, 1.0); - GridTools::transform (std_cxx11::bind(&Geometry::push_forward, - std_cxx11::cref(geometry), - std_cxx11::_1), + GridTools::transform (std::bind(&Geometry::push_forward, + std::cref(geometry), + std::placeholders::_1), triangulation); triangulation.set_manifold(0, geometry); diff --git a/tests/mappings/mapping_q_manifold_01.cc b/tests/mappings/mapping_q_manifold_01.cc index ac790386f1..8a49a78fe0 100644 --- a/tests/mappings/mapping_q_manifold_01.cc +++ b/tests/mappings/mapping_q_manifold_01.cc @@ -136,9 +136,9 @@ void create_tria(Triangulation &triangulation, const Geometry &geometr GridGenerator::hyper_cube (triangulation, -1., 1.); triangulation.refine_global(3); - GridTools::transform (std_cxx11::bind(&Geometry::push_forward, - std_cxx11::cref(geometry), - std_cxx11::_1), + GridTools::transform (std::bind(&Geometry::push_forward, + std::cref(geometry), + std::placeholders::_1), triangulation); triangulation.set_manifold(0, geometry); diff --git a/tests/mappings/mapping_q_mixed_manifolds_01.cc b/tests/mappings/mapping_q_mixed_manifolds_01.cc index 6c135b2ead..dd49a5a2b3 100644 --- a/tests/mappings/mapping_q_mixed_manifolds_01.cc +++ b/tests/mappings/mapping_q_mixed_manifolds_01.cc @@ -44,7 +44,7 @@ void test() Point direction; direction[dim-1] = 1.; - std_cxx11::shared_ptr > cylinder_manifold + std::shared_ptr > cylinder_manifold (dim == 2 ? static_cast*>(new SphericalManifold(Point())) : static_cast*>(new CylindricalManifold(direction, Point()))); diff --git a/tests/mappings/mapping_q_mixed_manifolds_02.cc b/tests/mappings/mapping_q_mixed_manifolds_02.cc index 27abc90135..ec551b0559 100644 --- a/tests/mappings/mapping_q_mixed_manifolds_02.cc +++ b/tests/mappings/mapping_q_mixed_manifolds_02.cc @@ -161,7 +161,7 @@ void test() Point direction; direction[dim-1] = 1.; - std_cxx11::shared_ptr > cylinder_manifold + std::shared_ptr > cylinder_manifold (dim == 2 ? static_cast*>(new SphericalManifold(center)) : static_cast*>(new CylindricalManifold(direction, center))); Triangulation tria; diff --git a/tests/matrix_free/estimate_condition_number_mass.cc b/tests/matrix_free/estimate_condition_number_mass.cc index c34ac0dc52..d8e53ab822 100644 --- a/tests/matrix_free/estimate_condition_number_mass.cc +++ b/tests/matrix_free/estimate_condition_number_mass.cc @@ -77,10 +77,10 @@ public: const Vector &src) const { dst = 0; - const std_cxx11::function &, - Vector &, - const Vector &, - const std::pair &)> + const std::function &, + Vector &, + const Vector &, + const std::pair &)> wrap = mass_operator; data.cell_loop (wrap, dst, src); }; diff --git a/tests/matrix_free/laplace_operator_01.cc b/tests/matrix_free/laplace_operator_01.cc index ac854b7f0f..31f50b068b 100644 --- a/tests/matrix_free/laplace_operator_01.cc +++ b/tests/matrix_free/laplace_operator_01.cc @@ -97,7 +97,7 @@ void test () //std::cout << "Number of degrees of freedom: " << dof.n_dofs() << std::endl; //std::cout << "Number of constraints: " << constraints.n_constraints() << std::endl; - std_cxx11::shared_ptr > mf_data(new MatrixFree ()); + std::shared_ptr > mf_data(new MatrixFree ()); { const QGauss<1> quad (fe_degree+1); typename MatrixFree::AdditionalData data; diff --git a/tests/matrix_free/laplace_operator_02.cc b/tests/matrix_free/laplace_operator_02.cc index 6323d8ab07..0f8b6a8843 100644 --- a/tests/matrix_free/laplace_operator_02.cc +++ b/tests/matrix_free/laplace_operator_02.cc @@ -141,7 +141,7 @@ void test () //std::cout << "Number of degrees of freedom: " << dof.n_dofs() << std::endl; //std::cout << "Number of constraints: " << constraints.n_constraints() << std::endl; - std_cxx11::shared_ptr > mf_data(new MatrixFree ()); + std::shared_ptr > mf_data(new MatrixFree ()); { const QGauss<1> quad (fe_degree+1); typename MatrixFree::AdditionalData data; @@ -152,8 +152,8 @@ void test () mf_data->reinit (dof, constraints, quad, data); } - std_cxx11::shared_ptr > > coefficient; - coefficient = std_cxx11::make_shared > >(); + std::shared_ptr > > coefficient; + coefficient = std::make_shared > >(); { FEEvaluation fe_eval(*mf_data); diff --git a/tests/matrix_free/mass_operator_01.cc b/tests/matrix_free/mass_operator_01.cc index e04c248f2d..0612dac126 100644 --- a/tests/matrix_free/mass_operator_01.cc +++ b/tests/matrix_free/mass_operator_01.cc @@ -105,7 +105,7 @@ void test () //std::cout << "Number of degrees of freedom: " << dof.n_dofs() << std::endl; //std::cout << "Number of constraints: " << constraints.n_constraints() << std::endl; - std_cxx11::shared_ptr > mf_data(new MatrixFree ()); + std::shared_ptr > mf_data(new MatrixFree ()); { const QGauss<1> quad (fe_degree+2); typename MatrixFree::AdditionalData data; diff --git a/tests/matrix_free/mass_operator_02.cc b/tests/matrix_free/mass_operator_02.cc index ede1dfafba..06ce108f94 100644 --- a/tests/matrix_free/mass_operator_02.cc +++ b/tests/matrix_free/mass_operator_02.cc @@ -69,7 +69,7 @@ void test () //std::cout << "Number of degrees of freedom: " << dof.n_dofs() << std::endl; //std::cout << "Number of constraints: " << constraints.n_constraints() << std::endl; - std_cxx11::shared_ptr > mf_data(new MatrixFree ()); + std::shared_ptr > mf_data(new MatrixFree ()); { const QGauss<1> quad (fe_degree+2); typename MatrixFree::AdditionalData data; diff --git a/tests/matrix_free/mass_operator_03.cc b/tests/matrix_free/mass_operator_03.cc index 9248062ec4..b68c2c287f 100644 --- a/tests/matrix_free/mass_operator_03.cc +++ b/tests/matrix_free/mass_operator_03.cc @@ -68,7 +68,7 @@ void test () //std::cout << "Number of degrees of freedom: " << dof.n_dofs() << std::endl; //std::cout << "Number of constraints: " << constraints.n_constraints() << std::endl; - std_cxx11::shared_ptr > mf_data(new MatrixFree ()); + std::shared_ptr > mf_data(new MatrixFree ()); { const QGauss<1> quad (fe_degree+2); typename MatrixFree::AdditionalData data; diff --git a/tests/matrix_free/mass_operator_04.cc b/tests/matrix_free/mass_operator_04.cc index 3b3c4f0764..357ca4c5b2 100644 --- a/tests/matrix_free/mass_operator_04.cc +++ b/tests/matrix_free/mass_operator_04.cc @@ -58,9 +58,9 @@ void test () constraints_0.close(); constraints_1.close(); - std_cxx11::shared_ptr > mf_data_0(new MatrixFree ()); - std_cxx11::shared_ptr > mf_data_1(new MatrixFree ()); - std_cxx11::shared_ptr > mf_data_combined(new MatrixFree ()); + std::shared_ptr > mf_data_0(new MatrixFree ()); + std::shared_ptr > mf_data_1(new MatrixFree ()); + std::shared_ptr > mf_data_combined(new MatrixFree ()); const QGauss<1> quad (2); typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = diff --git a/tests/matrix_free/matrix_vector_12.cc b/tests/matrix_free/matrix_vector_12.cc index d7b9576c35..b1a912287d 100644 --- a/tests/matrix_free/matrix_vector_12.cc +++ b/tests/matrix_free/matrix_vector_12.cc @@ -87,10 +87,10 @@ public: { for (unsigned int i=0; i &, - std::vector > &, - const std::vector > &, - const std::pair &)> + const std::function &, + std::vector > &, + const std::vector > &, + const std::pair &)> wrap = helmholtz_operator; data.cell_loop (wrap, dst, src); }; diff --git a/tests/matrix_free/matrix_vector_13.cc b/tests/matrix_free/matrix_vector_13.cc index 408efee6fb..88c5c63300 100644 --- a/tests/matrix_free/matrix_vector_13.cc +++ b/tests/matrix_free/matrix_vector_13.cc @@ -87,10 +87,10 @@ public: const LinearAlgebra::distributed::BlockVector &src) const { dst = 0; - const std_cxx11::function &, - LinearAlgebra::distributed::BlockVector &, - const LinearAlgebra::distributed::BlockVector &, - const std::pair &)> + const std::function &, + LinearAlgebra::distributed::BlockVector &, + const LinearAlgebra::distributed::BlockVector &, + const std::pair &)> wrap = helmholtz_operator; data.cell_loop (wrap, dst, src); }; diff --git a/tests/matrix_free/matrix_vector_20.cc b/tests/matrix_free/matrix_vector_20.cc index 0852450373..c579968810 100644 --- a/tests/matrix_free/matrix_vector_20.cc +++ b/tests/matrix_free/matrix_vector_20.cc @@ -99,10 +99,10 @@ public: { for (unsigned int i=0; i &, - parallel::distributed::BlockVector &, - const parallel::distributed::BlockVector &, - const std::pair &)> + const std::function &, + parallel::distributed::BlockVector &, + const parallel::distributed::BlockVector &, + const std::pair &)> wrap = helmholtz_operator; data.cell_loop (wrap, dst, src); }; diff --git a/tests/matrix_free/matrix_vector_21.cc b/tests/matrix_free/matrix_vector_21.cc index 51867f9bfb..b9320bf6c0 100644 --- a/tests/matrix_free/matrix_vector_21.cc +++ b/tests/matrix_free/matrix_vector_21.cc @@ -90,10 +90,10 @@ public: { for (unsigned int i=0; i &, - parallel::distributed::BlockVector &, - const parallel::distributed::BlockVector &, - const std::pair &)> + const std::function &, + parallel::distributed::BlockVector &, + const parallel::distributed::BlockVector &, + const std::pair &)> wrap = helmholtz_operator; data.cell_loop (wrap, dst, src); }; diff --git a/tests/matrix_free/matrix_vector_22.cc b/tests/matrix_free/matrix_vector_22.cc index c78b19ffe1..3f1b39a0f5 100644 --- a/tests/matrix_free/matrix_vector_22.cc +++ b/tests/matrix_free/matrix_vector_22.cc @@ -88,10 +88,10 @@ public: { for (unsigned int i=0; i &, - std::vector *> &, - const std::vector *> &, - const std::pair &)> + const std::function &, + std::vector *> &, + const std::vector *> &, + const std::pair &)> wrap = helmholtz_operator; data.cell_loop (wrap, dst, src); }; diff --git a/tests/matrix_free/matrix_vector_23.cc b/tests/matrix_free/matrix_vector_23.cc index 3e74ebf2af..78215404d1 100644 --- a/tests/matrix_free/matrix_vector_23.cc +++ b/tests/matrix_free/matrix_vector_23.cc @@ -99,10 +99,10 @@ public: { for (unsigned int i=0; i &, - std::vector *> &, - const std::vector *> &, - const std::pair &)> + const std::function &, + std::vector *> &, + const std::vector *> &, + const std::pair &)> wrap = helmholtz_operator; data.cell_loop (wrap, dst, src); }; diff --git a/tests/matrix_free/matrix_vector_mf.h b/tests/matrix_free/matrix_vector_mf.h index 461e74f4e4..630bd47616 100644 --- a/tests/matrix_free/matrix_vector_mf.h +++ b/tests/matrix_free/matrix_vector_mf.h @@ -70,10 +70,10 @@ public: const VectorType &src) const { dst = 0; - const std_cxx11::function &, - VectorType &, - const VectorType &, - const std::pair &)> + const std::function &, + VectorType &, + const VectorType &, + const std::pair &)> wrap = helmholtz_operator; data.cell_loop (wrap, dst, src); }; diff --git a/tests/matrix_free/matrix_vector_stokes_base.cc b/tests/matrix_free/matrix_vector_stokes_base.cc index 26ed95f6b3..6700a82a82 100644 --- a/tests/matrix_free/matrix_vector_stokes_base.cc +++ b/tests/matrix_free/matrix_vector_stokes_base.cc @@ -119,7 +119,7 @@ test() dof_u.distribute_dofs(fe_u); dof_p.distribute_dofs(fe_p); - std_cxx11::shared_ptr > mf_data; + std::shared_ptr > mf_data; dof.distribute_dofs(fe); ConstraintMatrix constraints, constraints_u, constraints_p; @@ -242,7 +242,7 @@ test() mf_system_rhs.block(1)(j) = val; } - mf_data = std_cxx11::shared_ptr >(new MatrixFree()); + mf_data = std::shared_ptr >(new MatrixFree()); // setup matrix-free structure { std::vector*> dofs; diff --git a/tests/matrix_free/parallel_multigrid_02.cc b/tests/matrix_free/parallel_multigrid_02.cc index 1444804d12..97c59de687 100644 --- a/tests/matrix_free/parallel_multigrid_02.cc +++ b/tests/matrix_free/parallel_multigrid_02.cc @@ -114,7 +114,7 @@ void do_test (const DoFHandler &dof) MappingQ mapping(fe_degree+1); LaplaceOperator > fine_matrix; - std_cxx11::shared_ptr > fine_level_data(new MatrixFree ()); + std::shared_ptr > fine_level_data(new MatrixFree ()); typename MatrixFree::AdditionalData fine_level_additional_data; fine_level_additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; @@ -155,7 +155,7 @@ void do_test (const DoFHandler &dof) mg_level_data[level].reinit (mapping, dof, level_constraints, QGauss<1>(n_q_points_1d), mg_additional_data); - mg_matrices[level].initialize(std_cxx11::make_shared >( + mg_matrices[level].initialize(std::make_shared >( mg_level_data[level]), mg_constrained_dofs, level); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_02.cc b/tests/matrix_free/parallel_multigrid_adaptive_02.cc index db47b66d7c..b6ee95fc60 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_02.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_02.cc @@ -151,7 +151,7 @@ void do_test (const DoFHandler &dof) MappingQ mapping(fe_degree+1); LaplaceOperator > fine_matrix; - std_cxx11::shared_ptr > fine_level_data(new MatrixFree ()); + std::shared_ptr > fine_level_data(new MatrixFree ()); typename MatrixFree::AdditionalData fine_level_additional_data; fine_level_additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; @@ -204,7 +204,7 @@ void do_test (const DoFHandler &dof) mg_level_data[level].reinit (mapping, dof, level_constraints, QGauss<1>(n_q_points_1d), mg_additional_data); - mg_matrices[level].initialize(std_cxx11::make_shared >( + mg_matrices[level].initialize(std::make_shared >( mg_level_data[level]), mg_constrained_dofs, level); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_04.cc b/tests/matrix_free/parallel_multigrid_adaptive_04.cc index 3209b7c575..de07613351 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_04.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_04.cc @@ -151,7 +151,7 @@ void do_test (const DoFHandler &dof) MappingQ mapping(fe_degree+1); LaplaceOperator > fine_matrix; - std_cxx11::shared_ptr > fine_level_data(new MatrixFree ()); + std::shared_ptr > fine_level_data(new MatrixFree ()); typename MatrixFree::AdditionalData fine_level_additional_data; fine_level_additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; @@ -204,7 +204,7 @@ void do_test (const DoFHandler &dof) mg_level_data[level].reinit (mapping, dof, level_constraints, QGauss<1>(n_q_points_1d), mg_additional_data); - mg_matrices[level].initialize(std_cxx11::make_shared > ( + mg_matrices[level].initialize(std::make_shared > ( mg_level_data[level]), mg_constrained_dofs, level); diff --git a/tests/mpi/cell_weights_01_back_and_forth_01.cc b/tests/mpi/cell_weights_01_back_and_forth_01.cc index bbecf592c7..c9b3837573 100644 --- a/tests/mpi/cell_weights_01_back_and_forth_01.cc +++ b/tests/mpi/cell_weights_01_back_and_forth_01.cc @@ -70,16 +70,16 @@ void test() // repartition the mesh as described above, first in some arbitrary // way, and then with all equal weights - tr.signals.cell_weight.connect(std_cxx11::bind(&cell_weight_1, - std_cxx11::_1, - std_cxx11::_2)); + tr.signals.cell_weight.connect(std::bind(&cell_weight_1, + std::placeholders::_1, + std::placeholders::_2)); tr.repartition(); tr.signals.cell_weight.disconnect_all_slots(); - tr.signals.cell_weight.connect(std_cxx11::bind(&cell_weight_2, - std_cxx11::_1, - std_cxx11::_2)); + tr.signals.cell_weight.connect(std::bind(&cell_weight_2, + std::placeholders::_1, + std::placeholders::_2)); tr.repartition(); diff --git a/tests/mpi/cell_weights_01_back_and_forth_02.cc b/tests/mpi/cell_weights_01_back_and_forth_02.cc index 29a66a60f8..5b67a4120b 100644 --- a/tests/mpi/cell_weights_01_back_and_forth_02.cc +++ b/tests/mpi/cell_weights_01_back_and_forth_02.cc @@ -60,9 +60,9 @@ void test() // repartition the mesh as described above, first in some arbitrary // way, and then with no weights - tr.signals.cell_weight.connect(std_cxx11::bind(&cell_weight_1, - std_cxx11::_1, - std_cxx11::_2)); + tr.signals.cell_weight.connect(std::bind(&cell_weight_1, + std::placeholders::_1, + std::placeholders::_2)); tr.repartition(); tr.signals.cell_weight.disconnect_all_slots(); diff --git a/tests/mpi/cell_weights_02.cc b/tests/mpi/cell_weights_02.cc index f5d7ffcb3b..56615175ae 100644 --- a/tests/mpi/cell_weights_02.cc +++ b/tests/mpi/cell_weights_02.cc @@ -52,9 +52,9 @@ void test() GridGenerator::subdivided_hyper_cube(tr, 16); - tr.signals.cell_weight.connect(std_cxx11::bind(&cell_weight, - std_cxx11::_1, - std_cxx11::_2)); + tr.signals.cell_weight.connect(std::bind(&cell_weight, + std::placeholders::_1, + std::placeholders::_2)); tr.refine_global(1); if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) diff --git a/tests/mpi/cell_weights_03.cc b/tests/mpi/cell_weights_03.cc index aefe480cf2..0b144b01c5 100644 --- a/tests/mpi/cell_weights_03.cc +++ b/tests/mpi/cell_weights_03.cc @@ -63,9 +63,9 @@ void test() tr.refine_global(1); - tr.signals.cell_weight.connect(std_cxx11::bind(&cell_weight, - std_cxx11::_1, - std_cxx11::_2)); + tr.signals.cell_weight.connect(std::bind(&cell_weight, + std::placeholders::_1, + std::placeholders::_2)); tr.repartition(); diff --git a/tests/mpi/cell_weights_04.cc b/tests/mpi/cell_weights_04.cc index b09fe61e73..c038d25360 100644 --- a/tests/mpi/cell_weights_04.cc +++ b/tests/mpi/cell_weights_04.cc @@ -58,9 +58,9 @@ void test() GridGenerator::subdivided_hyper_cube(tr, 16); - tr.signals.cell_weight.connect(std_cxx11::bind(&cell_weight, - std_cxx11::_1, - std_cxx11::_2)); + tr.signals.cell_weight.connect(std::bind(&cell_weight, + std::placeholders::_1, + std::placeholders::_2)); tr.refine_global(1); diff --git a/tests/mpi/cell_weights_05.cc b/tests/mpi/cell_weights_05.cc index bf8b580741..03441155a3 100644 --- a/tests/mpi/cell_weights_05.cc +++ b/tests/mpi/cell_weights_05.cc @@ -78,9 +78,9 @@ void test() // repartition the mesh; attach different weights to all cells - tr.signals.cell_weight.connect(std_cxx11::bind(&cell_weight, - std_cxx11::_1, - std_cxx11::_2)); + tr.signals.cell_weight.connect(std::bind(&cell_weight, + std::placeholders::_1, + std::placeholders::_2)); tr.repartition (); diff --git a/tests/mpi/cell_weights_06.cc b/tests/mpi/cell_weights_06.cc index dcf643e2e4..8c482d6b32 100644 --- a/tests/mpi/cell_weights_06.cc +++ b/tests/mpi/cell_weights_06.cc @@ -78,9 +78,9 @@ void test() // repartition the mesh; attach different weights to all cells n_global_active_cells = tr.n_global_active_cells(); - tr.signals.cell_weight.connect(std_cxx11::bind(&cell_weight, - std_cxx11::_1, - std_cxx11::_2)); + tr.signals.cell_weight.connect(std::bind(&cell_weight, + std::placeholders::_1, + std::placeholders::_2)); tr.repartition (); if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) diff --git a/tests/mpi/crash_06.cc b/tests/mpi/crash_06.cc index c379774476..935c558f33 100644 --- a/tests/mpi/crash_06.cc +++ b/tests/mpi/crash_06.cc @@ -75,14 +75,14 @@ void test(FiniteElement &fe) template void testit() { - 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))); + std::vector > > fes; + fes.push_back(std::shared_ptr >(new FE_RaviartThomas(0))); + fes.push_back(std::shared_ptr >(new FE_RaviartThomas(1))); + fes.push_back(std::shared_ptr >(new FE_Nedelec(0))); + fes.push_back(std::shared_ptr >(new FE_Nedelec(1))); + fes.push_back(std::shared_ptr >(new FE_Q(3))); + fes.push_back(std::shared_ptr >(new FE_DGQ(2))); + fes.push_back(std::shared_ptr >(new FE_Q_DG0(2))); for (unsigned int i=0; i -#include #include #include #include @@ -34,7 +33,7 @@ #include #include -#include +#include #include //#define DEBUG_OUTPUT_VTK @@ -140,10 +139,10 @@ check_this (const FiniteElement &fe1, if (!fe2.isotropic_restriction_is_implemented()) return; - std_cxx11::unique_ptr > tria(make_tria()); + std::unique_ptr > tria(make_tria()); - std_cxx11::unique_ptr > dof1(make_dof_handler (*tria, fe1)); - std_cxx11::unique_ptr > dof2(make_dof_handler (*tria, fe2)); + std::unique_ptr > dof1(make_dof_handler (*tria, fe1)); + std::unique_ptr > dof2(make_dof_handler (*tria, fe2)); ConstraintMatrix cm1; DoFTools::make_hanging_node_constraints (*dof1, cm1); cm1.close (); @@ -264,10 +263,10 @@ check_this_dealii (const FiniteElement &fe1, if (!fe2.isotropic_restriction_is_implemented()) return; - std_cxx11::unique_ptr > tria(make_tria()); + std::unique_ptr > tria(make_tria()); - std_cxx11::unique_ptr > dof1(make_dof_handler (*tria, fe1)); - std_cxx11::unique_ptr > dof2(make_dof_handler (*tria, fe2)); + std::unique_ptr > dof1(make_dof_handler (*tria, fe1)); + std::unique_ptr > dof2(make_dof_handler (*tria, fe2)); ConstraintMatrix cm1; DoFTools::make_hanging_node_constraints (*dof1, cm1); cm1.close (); diff --git a/tests/mpi/mesh_worker_01.cc b/tests/mpi/mesh_worker_01.cc index f38d50f63d..a32300856f 100644 --- a/tests/mpi/mesh_worker_01.cc +++ b/tests/mpi/mesh_worker_01.cc @@ -102,9 +102,9 @@ test_simple(DoFHandler &dofs, MeshWorker::LoopControl &lctrl) // typename identity::type end, // DOFINFO &dinfo, // INFOBOX &info, -// const std_cxx11::function &cell_worker, -// const std_cxx11::function &boundary_worker, -// const std_cxx11::function &cell_worker, +// const std::function &boundary_worker, +// const std::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_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), +// std::bind (&Integrator::cell, local, std::placeholders::_1, std::placeholders::_2), +// std::bind (&Integrator::bdry, local, std::placeholders::_1, std::placeholders::_2), +// std::bind (&Integrator::face, local, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), // local, // lctrl); } diff --git a/tests/mpi/mesh_worker_02.cc b/tests/mpi/mesh_worker_02.cc index 3d727339af..6c5a2c4bea 100644 --- a/tests/mpi/mesh_worker_02.cc +++ b/tests/mpi/mesh_worker_02.cc @@ -101,9 +101,9 @@ test_simple(DoFHandler &dofs, MeshWorker::LoopControl &lctrl) // typename identity::type end, // DOFINFO &dinfo, // INFOBOX &info, -// const std_cxx11::function &cell_worker, -// const std_cxx11::function &boundary_worker, -// const std_cxx11::function &cell_worker, +// const std::function &boundary_worker, +// const std::function &face_worker, // ASSEMBLER &assembler, @@ -121,9 +121,9 @@ test_simple(DoFHandler &dofs, MeshWorker::LoopControl &lctrl) // MeshWorker::loop, MeshWorker::IntegrationInfoBox > // (dofs.begin_active(), dofs.end(), // dof_info, info_box, -// 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), +// std::bind (&Integrator::cell, local, std::placeholders::_1, std::placeholders::_2), +// std::bind (&Integrator::bdry, local, std::placeholders::_1, std::placeholders::_2), +// std::bind (&Integrator::face, local, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), // local, // lctrl); } diff --git a/tests/mpi/mesh_worker_03.cc b/tests/mpi/mesh_worker_03.cc index 1f6af555cb..7b0fc2a9ca 100644 --- a/tests/mpi/mesh_worker_03.cc +++ b/tests/mpi/mesh_worker_03.cc @@ -101,9 +101,9 @@ test_simple(DoFHandler &dofs, MeshWorker::LoopControl &lctrl) // typename identity::type end, // DOFINFO &dinfo, // INFOBOX &info, -// const std_cxx11::function &cell_worker, -// const std_cxx11::function &boundary_worker, -// const std_cxx11::function &cell_worker, +// const std::function &boundary_worker, +// const std::function &face_worker, // ASSEMBLER &assembler, @@ -121,9 +121,9 @@ test_simple(DoFHandler &dofs, MeshWorker::LoopControl &lctrl) // MeshWorker::loop, MeshWorker::IntegrationInfoBox > // (dofs.begin_active(), dofs.end(), // dof_info, info_box, -// 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), +// std::bind (&Integrator::cell, local, std::placeholders::_1, std::placeholders::_2), +// std::bind (&Integrator::bdry, local, std::placeholders::_1, std::placeholders::_2), +// std::bind (&Integrator::face, local, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), // local, // lctrl); } diff --git a/tests/mpi/mesh_worker_04.cc b/tests/mpi/mesh_worker_04.cc index a9b8221b8c..c830290bed 100644 --- a/tests/mpi/mesh_worker_04.cc +++ b/tests/mpi/mesh_worker_04.cc @@ -102,9 +102,9 @@ test_simple(DoFHandler &dofs, MeshWorker::LoopControl &lctrl) // typename identity::type end, // DOFINFO &dinfo, // INFOBOX &info, -// const std_cxx11::function &cell_worker, -// const std_cxx11::function &boundary_worker, -// const std_cxx11::function &cell_worker, +// const std::function &boundary_worker, +// const std::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_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), +// std::bind (&Integrator::cell, local, std::placeholders::_1, std::placeholders::_2), +// std::bind (&Integrator::bdry, local, std::placeholders::_1, std::placeholders::_2), +// std::bind (&Integrator::face, local, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), // local, // lctrl); } diff --git a/tests/mpi/mesh_worker_05.cc b/tests/mpi/mesh_worker_05.cc index b5ffb62ad4..9246bc174e 100644 --- a/tests/mpi/mesh_worker_05.cc +++ b/tests/mpi/mesh_worker_05.cc @@ -103,9 +103,9 @@ test_simple(DoFHandler &dofs, MeshWorker::LoopControl &lctrl) // typename identity::type end, // DOFINFO &dinfo, // INFOBOX &info, -// const std_cxx11::function &cell_worker, -// const std_cxx11::function &boundary_worker, -// const std_cxx11::function &cell_worker, +// const std::function &boundary_worker, +// const std::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_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), +// std::bind (&Integrator::cell, local, std::placeholders::_1, std::placeholders::_2), +// std::bind (&Integrator::bdry, local, std::placeholders::_1, std::placeholders::_2), +// std::bind (&Integrator::face, local, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), // local, // lctrl); } diff --git a/tests/mpi/mesh_worker_matrix_01.cc b/tests/mpi/mesh_worker_matrix_01.cc index 80a86a131f..d89ccd02ba 100644 --- a/tests/mpi/mesh_worker_matrix_01.cc +++ b/tests/mpi/mesh_worker_matrix_01.cc @@ -23,7 +23,6 @@ #include #include -#include #include #include #include @@ -38,6 +37,7 @@ #include #include +#include #include using namespace dealii; @@ -162,9 +162,9 @@ test_simple(DoFHandler &dofs, bool faces) MeshWorker::loop, MeshWorker::IntegrationInfoBox > (cell, end, dof_info, info_box, - 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), + std::bind (&Local::cell, local, std::placeholders::_1, std::placeholders::_2), + std::bind (&Local::bdry, local, std::placeholders::_1, std::placeholders::_2), + std::bind (&Local::face, local, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), assembler, lctrl); matrix.compress(VectorOperation::add); diff --git a/tests/mpi/tria_signals_02.cc b/tests/mpi/tria_signals_02.cc index c2cfb7bd80..85c807957b 100644 --- a/tests/mpi/tria_signals_02.cc +++ b/tests/mpi/tria_signals_02.cc @@ -18,9 +18,9 @@ #include #include #include -#include #include +#include #include // Test on whether signals post_refinement_on_cell and pre_coarsening_on_cell @@ -39,14 +39,14 @@ public: tria(tria_in) { tria_in.signals.post_refinement_on_cell.connect - (std_cxx11::bind (&SignalListener::count_on_refine, - this, - std_cxx11::placeholders::_1)); + (std::bind (&SignalListener::count_on_refine, + this, + std::placeholders::_1)); tria_in.signals.pre_coarsening_on_cell.connect - (std_cxx11::bind (&SignalListener::count_on_coarsen, - this, - std_cxx11::placeholders::_1)); + (std::bind (&SignalListener::count_on_coarsen, + this, + std::placeholders::_1)); } int n_active_cell_gap() diff --git a/tests/mpi/tria_signals_03.cc b/tests/mpi/tria_signals_03.cc index a4ec17c352..ba7b98da95 100644 --- a/tests/mpi/tria_signals_03.cc +++ b/tests/mpi/tria_signals_03.cc @@ -18,9 +18,9 @@ #include #include #include -#include #include +#include #include // Test on whether signals post_refinement_on_cell and pre_coarsening_on_cell @@ -42,14 +42,14 @@ public: tria(tria_in) { tria_in.signals.post_refinement_on_cell.connect - (std_cxx11::bind (&SignalListener::count_on_refine, - this, - std_cxx11::placeholders::_1)); + (std::bind (&SignalListener::count_on_refine, + this, + std::placeholders::_1)); tria_in.signals.pre_coarsening_on_cell.connect - (std_cxx11::bind (&SignalListener::count_on_coarsen, - this, - std_cxx11::placeholders::_1)); + (std::bind (&SignalListener::count_on_coarsen, + this, + std::placeholders::_1)); } int n_active_cell_gap() diff --git a/tests/mpi/tria_signals_04.cc b/tests/mpi/tria_signals_04.cc index ebaa61b869..10754067e3 100644 --- a/tests/mpi/tria_signals_04.cc +++ b/tests/mpi/tria_signals_04.cc @@ -18,9 +18,9 @@ #include #include #include -#include #include +#include #include // Test on whether signals post_refinement_on_cell and pre_coarsening_on_cell @@ -43,14 +43,14 @@ public: tria(tria_in) { tria_in.signals.post_refinement_on_cell.connect - (std_cxx11::bind (&SignalListener::count_on_refine, - this, - std_cxx11::placeholders::_1)); + (std::bind (&SignalListener::count_on_refine, + this, + std::placeholders::_1)); tria_in.signals.pre_coarsening_on_cell.connect - (std_cxx11::bind (&SignalListener::count_on_coarsen, - this, - std_cxx11::placeholders::_1)); + (std::bind (&SignalListener::count_on_coarsen, + this, + std::placeholders::_1)); } int n_active_cell_gap() diff --git a/tests/mpi/tria_signals_05.cc b/tests/mpi/tria_signals_05.cc index 59d1daf54a..54188463e9 100644 --- a/tests/mpi/tria_signals_05.cc +++ b/tests/mpi/tria_signals_05.cc @@ -18,9 +18,9 @@ #include #include #include -#include #include +#include #include // Test on whether signals post_refinement_on_cell and pre_coarsening_on_cell @@ -43,14 +43,14 @@ public: tria(tria_in) { tria_in.signals.post_refinement_on_cell.connect - (std_cxx11::bind (&SignalListener::count_on_refine, - this, - std_cxx11::placeholders::_1)); + (std::bind (&SignalListener::count_on_refine, + this, + std::placeholders::_1)); tria_in.signals.pre_coarsening_on_cell.connect - (std_cxx11::bind (&SignalListener::count_on_coarsen, - this, - std_cxx11::placeholders::_1)); + (std::bind (&SignalListener::count_on_coarsen, + this, + std::placeholders::_1)); } int n_active_cell_gap() diff --git a/tests/mpi/tria_signals_06.cc b/tests/mpi/tria_signals_06.cc index cda82fc25d..ab0d1e160e 100644 --- a/tests/mpi/tria_signals_06.cc +++ b/tests/mpi/tria_signals_06.cc @@ -18,9 +18,9 @@ #include #include #include -#include #include +#include #include // This is a test for test driver itself. Signals on refinement is disabled, @@ -43,14 +43,14 @@ public: tria(tria_in) { // tria_in.signals.post_refinement_on_cell.connect - // (std_cxx11::bind (&SignalListener::count_on_refine, + // (std::bind (&SignalListener::count_on_refine, // this, - // std_cxx11::placeholders::_1)); + // std::placeholders::_1)); tria_in.signals.pre_coarsening_on_cell.connect - (std_cxx11::bind (&SignalListener::count_on_coarsen, - this, - std_cxx11::placeholders::_1)); + (std::bind (&SignalListener::count_on_coarsen, + this, + std::placeholders::_1)); } int n_active_cell_gap() diff --git a/tests/multigrid/mg_renumbered_02.cc b/tests/multigrid/mg_renumbered_02.cc index 64fb9d494b..373354ba9d 100644 --- a/tests/multigrid/mg_renumbered_02.cc +++ b/tests/multigrid/mg_renumbered_02.cc @@ -59,8 +59,8 @@ #include #include +#include #include -#include using namespace dealii; @@ -265,7 +265,7 @@ LaplaceProblem::output_gpl(const DoFHandler &dof, MeshWorker::loop, MeshWorker::IntegrationInfoBox > ( dof.begin_mg(l), dof.end_mg(l), dof_info, info_box, - std_cxx11::bind(&OutputCreator::cell, &matrix_integrator, std_cxx11::_1, std_cxx11::_2), + std::bind(&OutputCreator::cell, &matrix_integrator, std::placeholders::_1, std::placeholders::_2), 0, 0, assembler); diff --git a/tests/multigrid/mg_renumbered_03.cc b/tests/multigrid/mg_renumbered_03.cc index fae5912959..859aa4b1ea 100644 --- a/tests/multigrid/mg_renumbered_03.cc +++ b/tests/multigrid/mg_renumbered_03.cc @@ -59,8 +59,8 @@ #include #include +#include #include -#include using namespace dealii; @@ -313,7 +313,7 @@ LaplaceProblem::output_gpl(const DoFHandler &dof, MeshWorker::loop, MeshWorker::IntegrationInfoBox > ( dof.begin_mg(l), dof.end_mg(l), dof_info, info_box, - std_cxx11::bind(&OutputCreator::cell, &matrix_integrator, std_cxx11::_1, std_cxx11::_2), + std::bind(&OutputCreator::cell, &matrix_integrator, std::placeholders::_1, std::placeholders::_2), 0, 0, assembler); diff --git a/tests/numerics/assemble_matrix_parallel_01.cc b/tests/numerics/assemble_matrix_parallel_01.cc index b5a9a5b1b1..54a4c07cc0 100644 --- a/tests/numerics/assemble_matrix_parallel_01.cc +++ b/tests/numerics/assemble_matrix_parallel_01.cc @@ -259,9 +259,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_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); + (std::bind(&LaplaceProblem::get_conflict_indices, this,std::placeholders::_1))); DynamicSparsityPattern csp (dof_handler.n_dofs(), @@ -362,16 +362,16 @@ void LaplaceProblem::assemble_test () WorkStream:: run (graph, - std_cxx11::bind (&LaplaceProblem:: - local_assemble, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind (&LaplaceProblem:: - copy_local_to_global, - this, - std_cxx11::_1), + std::bind (&LaplaceProblem:: + local_assemble, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind (&LaplaceProblem:: + copy_local_to_global, + this, + std::placeholders::_1), Assembly::Scratch::Data(fe_collection, quadrature_collection), Assembly::Copy::Data ()); diff --git a/tests/numerics/assemble_matrix_parallel_02.cc b/tests/numerics/assemble_matrix_parallel_02.cc index b84a0bf28b..ddacd2bcb3 100644 --- a/tests/numerics/assemble_matrix_parallel_02.cc +++ b/tests/numerics/assemble_matrix_parallel_02.cc @@ -277,9 +277,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_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); + (std::bind(&LaplaceProblem::get_conflict_indices, this,std::placeholders::_1))); DynamicSparsityPattern csp (dof_handler.n_dofs(), @@ -388,16 +388,16 @@ void LaplaceProblem::assemble_test_1 () WorkStream:: run (graph, - std_cxx11::bind (&LaplaceProblem:: - local_assemble, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind (&LaplaceProblem:: - copy_local_to_global, - this, - std_cxx11::_1), + std::bind (&LaplaceProblem:: + local_assemble, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind (&LaplaceProblem:: + copy_local_to_global, + this, + std::placeholders::_1), Assembly::Scratch::Data(fe_collection, quadrature_collection), Assembly::Copy::Data (), MultithreadInfo::n_threads(), @@ -413,16 +413,16 @@ void LaplaceProblem::assemble_test_2 () WorkStream:: run (graph, - std_cxx11::bind (&LaplaceProblem:: - local_assemble, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind (&LaplaceProblem:: - copy_local_to_global, - this, - std_cxx11::_1), + std::bind (&LaplaceProblem:: + local_assemble, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind (&LaplaceProblem:: + copy_local_to_global, + this, + std::placeholders::_1), Assembly::Scratch::Data(fe_collection, quadrature_collection), Assembly::Copy::Data (true), 2*MultithreadInfo::n_threads(), diff --git a/tests/numerics/assemble_matrix_parallel_03.cc b/tests/numerics/assemble_matrix_parallel_03.cc index 8307ff3081..249ce6e9d1 100644 --- a/tests/numerics/assemble_matrix_parallel_03.cc +++ b/tests/numerics/assemble_matrix_parallel_03.cc @@ -259,9 +259,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_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); + (std::bind(&LaplaceProblem::get_conflict_indices, this,std::placeholders::_1))); BlockDynamicSparsityPattern csp (2, 2); @@ -366,16 +366,16 @@ void LaplaceProblem::assemble_test () WorkStream:: run (graph, - std_cxx11::bind (&LaplaceProblem:: - local_assemble, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind (&LaplaceProblem:: - copy_local_to_global, - this, - std_cxx11::_1), + std::bind (&LaplaceProblem:: + local_assemble, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind (&LaplaceProblem:: + copy_local_to_global, + this, + std::placeholders::_1), Assembly::Scratch::Data(fe_collection, quadrature_collection), Assembly::Copy::Data ()); diff --git a/tests/numerics/assemble_matrix_parallel_04.cc b/tests/numerics/assemble_matrix_parallel_04.cc index 90814166cf..a3ff2b55ee 100644 --- a/tests/numerics/assemble_matrix_parallel_04.cc +++ b/tests/numerics/assemble_matrix_parallel_04.cc @@ -289,9 +289,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_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); + (std::bind(&LaplaceProblem::get_conflict_indices, this,std::placeholders::_1))); DynamicSparsityPattern csp (dof_handler.n_dofs(), @@ -416,16 +416,16 @@ void LaplaceProblem::assemble_test_1 () WorkStream:: run (graph, - std_cxx11::bind (&LaplaceProblem:: - local_assemble, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind (&LaplaceProblem:: - copy_local_to_global, - this, - std_cxx11::_1), + std::bind (&LaplaceProblem:: + local_assemble, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind (&LaplaceProblem:: + copy_local_to_global, + this, + std::placeholders::_1), Assembly::Scratch::Data(fe_collection, quadrature_collection), Assembly::Copy::Data (1), 2*MultithreadInfo::n_threads(), @@ -447,16 +447,16 @@ void LaplaceProblem::assemble_test_2 () WorkStream:: run (graph, - std_cxx11::bind (&LaplaceProblem:: - local_assemble, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind (&LaplaceProblem:: - copy_local_to_global, - this, - std_cxx11::_1), + std::bind (&LaplaceProblem:: + local_assemble, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind (&LaplaceProblem:: + copy_local_to_global, + this, + std::placeholders::_1), Assembly::Scratch::Data(fe_collection, quadrature_collection), Assembly::Copy::Data (2), 2*MultithreadInfo::n_threads(), diff --git a/tests/numerics/data_out_04.cc b/tests/numerics/data_out_04.cc index d7aad9a624..5bcadd0a1e 100644 --- a/tests/numerics/data_out_04.cc +++ b/tests/numerics/data_out_04.cc @@ -47,16 +47,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_cxx11::tuple + retval.push_back (std::tuple (get_dataset_names().size()-dim, get_dataset_names().size()-1, @@ -83,7 +83,7 @@ public: return DataOutReader::get_dataset_names(); } - std::vector > + std::vector > get_vector_data_ranges () const { return DataOutReader::get_vector_data_ranges (); @@ -134,23 +134,23 @@ check_this (const DoFHandler &dof_handler, ExcInternalError()); for (unsigned int i=0; i(data_out.get_vector_data_ranges()[i]) + deallog << std::get<0>(data_out.get_vector_data_ranges()[i]) << ' ' - << std_cxx11::get<1>(data_out.get_vector_data_ranges()[i]) + << std::get<1>(data_out.get_vector_data_ranges()[i]) << ' ' - << std_cxx11::get<2>(data_out.get_vector_data_ranges()[i]) + << std::get<2>(data_out.get_vector_data_ranges()[i]) << std::endl; - Assert (std_cxx11::get<0>(data_out.get_vector_data_ranges()[i]) + Assert (std::get<0>(data_out.get_vector_data_ranges()[i]) == - std_cxx11::get<0>(reader.get_vector_data_ranges()[i]), + std::get<0>(reader.get_vector_data_ranges()[i]), ExcInternalError()); - Assert (std_cxx11::get<1>(data_out.get_vector_data_ranges()[i]) + Assert (std::get<1>(data_out.get_vector_data_ranges()[i]) == - std_cxx11::get<1>(reader.get_vector_data_ranges()[i]), + std::get<1>(reader.get_vector_data_ranges()[i]), ExcInternalError()); - Assert (std_cxx11::get<2>(data_out.get_vector_data_ranges()[i]) + Assert (std::get<2>(data_out.get_vector_data_ranges()[i]) == - std_cxx11::get<2>(reader.get_vector_data_ranges()[i]), + std::get<2>(reader.get_vector_data_ranges()[i]), ExcInternalError()); } diff --git a/tests/numerics/data_out_faces_04.cc b/tests/numerics/data_out_faces_04.cc index b05ca80494..de9be1a8da 100644 --- a/tests/numerics/data_out_faces_04.cc +++ b/tests/numerics/data_out_faces_04.cc @@ -47,7 +47,7 @@ public: return DataOutFaces::get_dataset_names(); } - std::vector > + std::vector > get_vector_data_ranges () const { return DataOutFaces::get_vector_data_ranges (); @@ -72,7 +72,7 @@ public: return DataOutReader::get_dataset_names(); } - std::vector > + std::vector > get_vector_data_ranges () const { return DataOutReader::get_vector_data_ranges (); @@ -135,23 +135,23 @@ my_check_this (const DoFHandler &dof_handler, ExcInternalError()); for (unsigned int i=0; i(data_out.get_vector_data_ranges()[i]) + deallog << std::get<0>(data_out.get_vector_data_ranges()[i]) << ' ' - << std_cxx11::get<1>(data_out.get_vector_data_ranges()[i]) + << std::get<1>(data_out.get_vector_data_ranges()[i]) << ' ' - << std_cxx11::get<2>(data_out.get_vector_data_ranges()[i]) + << std::get<2>(data_out.get_vector_data_ranges()[i]) << std::endl; - Assert (std_cxx11::get<0>(data_out.get_vector_data_ranges()[i]) + Assert (std::get<0>(data_out.get_vector_data_ranges()[i]) == - std_cxx11::get<0>(reader.get_vector_data_ranges()[i]), + std::get<0>(reader.get_vector_data_ranges()[i]), ExcInternalError()); - Assert (std_cxx11::get<1>(data_out.get_vector_data_ranges()[i]) + Assert (std::get<1>(data_out.get_vector_data_ranges()[i]) == - std_cxx11::get<1>(reader.get_vector_data_ranges()[i]), + std::get<1>(reader.get_vector_data_ranges()[i]), ExcInternalError()); - Assert (std_cxx11::get<2>(data_out.get_vector_data_ranges()[i]) + Assert (std::get<2>(data_out.get_vector_data_ranges()[i]) == - std_cxx11::get<2>(reader.get_vector_data_ranges()[i]), + std::get<2>(reader.get_vector_data_ranges()[i]), ExcInternalError()); } diff --git a/tests/numerics/data_out_rotation_04.cc b/tests/numerics/data_out_rotation_04.cc index 5f48cdab4b..814b002bdf 100644 --- a/tests/numerics/data_out_rotation_04.cc +++ b/tests/numerics/data_out_rotation_04.cc @@ -47,7 +47,7 @@ public: return DataOutRotation::get_dataset_names(); } - std::vector > + std::vector > get_vector_data_ranges () const { return DataOutRotation::get_vector_data_ranges (); @@ -72,7 +72,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 @@ my_check_this (const DoFHandler &dof_handler, ExcInternalError()); for (unsigned int i=0; i(data_out.get_vector_data_ranges()[i]) + deallog << std::get<0>(data_out.get_vector_data_ranges()[i]) << ' ' - << std_cxx11::get<1>(data_out.get_vector_data_ranges()[i]) + << std::get<1>(data_out.get_vector_data_ranges()[i]) << ' ' - << std_cxx11::get<2>(data_out.get_vector_data_ranges()[i]) + << std::get<2>(data_out.get_vector_data_ranges()[i]) << std::endl; - Assert (std_cxx11::get<0>(data_out.get_vector_data_ranges()[i]) + Assert (std::get<0>(data_out.get_vector_data_ranges()[i]) == - std_cxx11::get<0>(reader.get_vector_data_ranges()[i]), + std::get<0>(reader.get_vector_data_ranges()[i]), ExcInternalError()); - Assert (std_cxx11::get<1>(data_out.get_vector_data_ranges()[i]) + Assert (std::get<1>(data_out.get_vector_data_ranges()[i]) == - std_cxx11::get<1>(reader.get_vector_data_ranges()[i]), + std::get<1>(reader.get_vector_data_ranges()[i]), ExcInternalError()); - Assert (std_cxx11::get<2>(data_out.get_vector_data_ranges()[i]) + Assert (std::get<2>(data_out.get_vector_data_ranges()[i]) == - std_cxx11::get<2>(reader.get_vector_data_ranges()[i]), + std::get<2>(reader.get_vector_data_ranges()[i]), ExcInternalError()); } diff --git a/tests/numerics/project_parallel_qpmf_common.h b/tests/numerics/project_parallel_qpmf_common.h index 20cb58f86a..79c1ec6143 100644 --- a/tests/numerics/project_parallel_qpmf_common.h +++ b/tests/numerics/project_parallel_qpmf_common.h @@ -119,7 +119,7 @@ void do_project (const parallel::distributed::Triangulation &triangulation, typename MatrixFree::AdditionalData additional_data; additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_color; additional_data.mapping_update_flags = update_values | update_JxW_values | update_quadrature_points; - std_cxx11::shared_ptr > data(new MatrixFree ()); + std::shared_ptr > data(new MatrixFree ()); data->reinit (dof_handler, constraints, quadrature_formula_1d, additional_data); for (unsigned int q=0; q<=p; ++q) diff --git a/tests/opencascade/closest_point_to_shape.cc b/tests/opencascade/closest_point_to_shape.cc index 2b83fc4706..9b63ab01ca 100644 --- a/tests/opencascade/closest_point_to_shape.cc +++ b/tests/opencascade/closest_point_to_shape.cc @@ -69,13 +69,13 @@ int main () TopoDS_Shape sh; for (unsigned int i=0; i, TopoDS_Shape, double, double> ref = + std::tuple, TopoDS_Shape, double, double> ref = project_point_and_pull_back(edge, points[i]); - Point<3> pp = std_cxx11::get<0>(ref); - sh = std_cxx11::get<1>(ref); - u = std_cxx11::get<2>(ref); - v = std_cxx11::get<3>(ref); + Point<3> pp = std::get<0>(ref); + sh = std::get<1>(ref); + u = std::get<2>(ref); + v = std::get<3>(ref); deallog << "Origin: " << points[i] << ", on unit circle: " << pp diff --git a/tests/opencascade/iges_describe.cc b/tests/opencascade/iges_describe.cc index 3df71be04d..26d4496826 100644 --- a/tests/opencascade/iges_describe.cc +++ b/tests/opencascade/iges_describe.cc @@ -35,15 +35,15 @@ int main () extract_geometrical_shapes(sh, faces, edges, vertices); - std_cxx11::tuple + std::tuple n = count_elements(sh); - unsigned int nf=std_cxx11::get<0>(n); - unsigned int ne=std_cxx11::get<1>(n); - unsigned int nv=std_cxx11::get<2>(n); + unsigned int nf=std::get<0>(n); + unsigned int ne=std::get<1>(n); + unsigned int nv=std::get<2>(n); - deallog << "Shape contains " << std_cxx11::get<0>(n) << " faces, " - << std_cxx11::get<1>(n) << " edges, and " - << std_cxx11::get<2>(n) << " vertices." << std::endl; + deallog << "Shape contains " << std::get<0>(n) << " faces, " + << std::get<1>(n) << " edges, and " + << std::get<2>(n) << " vertices." << std::endl; if (nf != faces.size()) deallog << "Error!" << std::endl; diff --git a/tests/opencascade/step_describe.cc b/tests/opencascade/step_describe.cc index ee0c59e8ae..fac3eba362 100644 --- a/tests/opencascade/step_describe.cc +++ b/tests/opencascade/step_describe.cc @@ -35,15 +35,15 @@ int main () extract_geometrical_shapes(sh, faces, edges, vertices); - std_cxx11::tuple + std::tuple n = count_elements(sh); - unsigned int nf=std_cxx11::get<0>(n); - unsigned int ne=std_cxx11::get<1>(n); - unsigned int nv=std_cxx11::get<2>(n); + unsigned int nf=std::get<0>(n); + unsigned int ne=std::get<1>(n); + unsigned int nv=std::get<2>(n); - deallog << "Shape contains " << std_cxx11::get<0>(n) << " faces, " - << std_cxx11::get<1>(n) << " edges, and " - << std_cxx11::get<2>(n) << " vertices." << std::endl; + deallog << "Shape contains " << std::get<0>(n) << " faces, " + << std::get<1>(n) << " edges, and " + << std::get<2>(n) << " vertices." << std::endl; if (nf != faces.size()) deallog << "Error!" << std::endl; diff --git a/tests/petsc/block_vector_iterator_03.cc b/tests/petsc/block_vector_iterator_03.cc index 22b7fc8e82..03b6cfb64b 100644 --- a/tests/petsc/block_vector_iterator_03.cc +++ b/tests/petsc/block_vector_iterator_03.cc @@ -178,9 +178,9 @@ void test () // check std::transform std::transform (v1.begin(), v1.end(), v2.begin(), - std_cxx11::bind (std::multiplies(), - std_cxx11::_1, - 2.0)); + std::bind (std::multiplies(), + std::placeholders::_1, + 2.0)); v2 *= 1./2.; deallog << "Check 7: " << (v1 == v2 ? "true" : "false") << std::endl; diff --git a/tests/physics/step-44-standard_tensors-material_push_forward.cc b/tests/physics/step-44-standard_tensors-material_push_forward.cc index 6e2f046299..dcfe7a469f 100644 --- a/tests/physics/step-44-standard_tensors-material_push_forward.cc +++ b/tests/physics/step-44-standard_tensors-material_push_forward.cc @@ -644,7 +644,7 @@ namespace Step44 return Jc; } private: - std_cxx11::shared_ptr< Material_Compressible_Neo_Hook_Three_Field > material; + std::shared_ptr< Material_Compressible_Neo_Hook_Three_Field > material; Tensor<2, dim> F_inv; SymmetricTensor<2, dim> tau; double d2Psi_vol_dJ2; @@ -1453,14 +1453,14 @@ namespace Step44 ScratchData_K scratch_data(fe, qf_cell, uf_cell); WorkStream::run(dof_handler_ref.begin_active(), dof_handler_ref.end(), - std_cxx11::bind(&Solid::assemble_system_tangent_one_cell, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind(&Solid::copy_local_to_global_K, - this, - std_cxx11::_1), + std::bind(&Solid::assemble_system_tangent_one_cell, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind(&Solid::copy_local_to_global_K, + this, + std::placeholders::_1), scratch_data, per_task_data); timer.leave_subsection(); @@ -1575,14 +1575,14 @@ namespace Step44 ScratchData_RHS scratch_data(fe, qf_cell, uf_cell, qf_face, uf_face); WorkStream::run(dof_handler_ref.begin_active(), dof_handler_ref.end(), - std_cxx11::bind(&Solid::assemble_system_rhs_one_cell, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind(&Solid::copy_local_to_global_rhs, - this, - std_cxx11::_1), + std::bind(&Solid::assemble_system_rhs_one_cell, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind(&Solid::copy_local_to_global_rhs, + this, + std::placeholders::_1), scratch_data, per_task_data); timer.leave_subsection(); diff --git a/tests/physics/step-44-standard_tensors-spatial.cc b/tests/physics/step-44-standard_tensors-spatial.cc index 8275198494..bce610dae3 100644 --- a/tests/physics/step-44-standard_tensors-spatial.cc +++ b/tests/physics/step-44-standard_tensors-spatial.cc @@ -530,7 +530,7 @@ namespace Step44 return Jc; } private: - std_cxx11::shared_ptr< Material_Compressible_Neo_Hook_Three_Field > material; + std::shared_ptr< Material_Compressible_Neo_Hook_Three_Field > material; Tensor<2, dim> F_inv; SymmetricTensor<2, dim> tau; double d2Psi_vol_dJ2; @@ -1339,14 +1339,14 @@ namespace Step44 ScratchData_K scratch_data(fe, qf_cell, uf_cell); WorkStream::run(dof_handler_ref.begin_active(), dof_handler_ref.end(), - std_cxx11::bind(&Solid::assemble_system_tangent_one_cell, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind(&Solid::copy_local_to_global_K, - this, - std_cxx11::_1), + std::bind(&Solid::assemble_system_tangent_one_cell, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind(&Solid::copy_local_to_global_K, + this, + std::placeholders::_1), scratch_data, per_task_data); timer.leave_subsection(); @@ -1461,14 +1461,14 @@ namespace Step44 ScratchData_RHS scratch_data(fe, qf_cell, uf_cell, qf_face, uf_face); WorkStream::run(dof_handler_ref.begin_active(), dof_handler_ref.end(), - std_cxx11::bind(&Solid::assemble_system_rhs_one_cell, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind(&Solid::copy_local_to_global_rhs, - this, - std_cxx11::_1), + std::bind(&Solid::assemble_system_rhs_one_cell, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind(&Solid::copy_local_to_global_rhs, + this, + std::placeholders::_1), scratch_data, per_task_data); timer.leave_subsection(); diff --git a/tests/physics/step-44.cc b/tests/physics/step-44.cc index 97a6a0f199..b187c89887 100644 --- a/tests/physics/step-44.cc +++ b/tests/physics/step-44.cc @@ -547,7 +547,7 @@ namespace Step44 return Jc; } private: - std_cxx11::shared_ptr< Material_Compressible_Neo_Hook_Three_Field > material; + std::shared_ptr< Material_Compressible_Neo_Hook_Three_Field > material; Tensor<2, dim> F_inv; SymmetricTensor<2, dim> tau; double d2Psi_vol_dJ2; @@ -1356,14 +1356,14 @@ namespace Step44 ScratchData_K scratch_data(fe, qf_cell, uf_cell); WorkStream::run(dof_handler_ref.begin_active(), dof_handler_ref.end(), - std_cxx11::bind(&Solid::assemble_system_tangent_one_cell, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind(&Solid::copy_local_to_global_K, - this, - std_cxx11::_1), + std::bind(&Solid::assemble_system_tangent_one_cell, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind(&Solid::copy_local_to_global_K, + this, + std::placeholders::_1), scratch_data, per_task_data); timer.leave_subsection(); @@ -1478,14 +1478,14 @@ namespace Step44 ScratchData_RHS scratch_data(fe, qf_cell, uf_cell, qf_face, uf_face); WorkStream::run(dof_handler_ref.begin_active(), dof_handler_ref.end(), - std_cxx11::bind(&Solid::assemble_system_rhs_one_cell, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind(&Solid::copy_local_to_global_rhs, - this, - std_cxx11::_1), + std::bind(&Solid::assemble_system_rhs_one_cell, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind(&Solid::copy_local_to_global_rhs, + this, + std::placeholders::_1), scratch_data, per_task_data); timer.leave_subsection(); diff --git a/tests/quick_tests/tbb.cc b/tests/quick_tests/tbb.cc index 7eacc440a2..1ac87d1b3a 100644 --- a/tests/quick_tests/tbb.cc +++ b/tests/quick_tests/tbb.cc @@ -68,9 +68,9 @@ void test2() WorkStream::run(v.begin(), v.end(), &assemble, - std_cxx11::bind(©, - std_cxx11::ref(result), - std_cxx11::_1), + std::bind(©, + std::ref(result), + std::placeholders::_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 1c08194384..ac9df076ca 100644 --- a/tests/trilinos/assemble_matrix_parallel_01.cc +++ b/tests/trilinos/assemble_matrix_parallel_01.cc @@ -254,9 +254,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_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); + (std::bind(&LaplaceProblem::get_conflict_indices, this,std::placeholders::_1))); DynamicSparsityPattern csp (dof_handler.n_dofs(), @@ -357,16 +357,16 @@ void LaplaceProblem::assemble_test () WorkStream:: run (graph, - std_cxx11::bind (&LaplaceProblem:: - local_assemble, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind (&LaplaceProblem:: - copy_local_to_global, - this, - std_cxx11::_1), + std::bind (&LaplaceProblem:: + local_assemble, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind (&LaplaceProblem:: + copy_local_to_global, + this, + std::placeholders::_1), Assembly::Scratch::Data(fe_collection, quadrature_collection), Assembly::Copy::Data (), 2*MultithreadInfo::n_threads(), diff --git a/tests/trilinos/assemble_matrix_parallel_02.cc b/tests/trilinos/assemble_matrix_parallel_02.cc index 003bf07623..4d51e9c3c9 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_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); + (std::bind(&LaplaceProblem::get_conflict_indices, this,std::placeholders::_1))); IndexSet locally_owned = dof_handler.locally_owned_dofs(); { @@ -366,16 +366,16 @@ void LaplaceProblem::assemble_test () WorkStream:: run (graph, - std_cxx11::bind (&LaplaceProblem:: - local_assemble, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind (&LaplaceProblem:: - copy_local_to_global, - this, - std_cxx11::_1), + std::bind (&LaplaceProblem:: + local_assemble, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind (&LaplaceProblem:: + copy_local_to_global, + this, + std::placeholders::_1), Assembly::Scratch::Data(fe, quadrature), Assembly::Copy::Data (false), 2*MultithreadInfo::n_threads(), diff --git a/tests/trilinos/assemble_matrix_parallel_03.cc b/tests/trilinos/assemble_matrix_parallel_03.cc index d5ced76a45..318f6213b8 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_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); + (std::bind(&LaplaceProblem::get_conflict_indices, this,std::placeholders::_1))); IndexSet locally_owned = dof_handler.locally_owned_dofs(); { @@ -367,16 +367,16 @@ void LaplaceProblem::assemble_test () WorkStream:: run (graph, - std_cxx11::bind (&LaplaceProblem:: - local_assemble, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind (&LaplaceProblem:: - copy_local_to_global, - this, - std_cxx11::_1), + std::bind (&LaplaceProblem:: + local_assemble, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind (&LaplaceProblem:: + copy_local_to_global, + this, + std::placeholders::_1), Assembly::Scratch::Data(fe, quadrature), Assembly::Copy::Data (false), 2*MultithreadInfo::n_threads(), diff --git a/tests/trilinos/assemble_matrix_parallel_04.cc b/tests/trilinos/assemble_matrix_parallel_04.cc index e733e4af40..a10cecc779 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_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); + (std::bind(&LaplaceProblem::get_conflict_indices, this,std::placeholders::_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_cxx11::bind (&LaplaceProblem:: - local_assemble, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind (&LaplaceProblem:: - copy_local_to_global, - this, - std_cxx11::_1), + std::bind (&LaplaceProblem:: + local_assemble, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind (&LaplaceProblem:: + copy_local_to_global, + this, + std::placeholders::_1), Assembly::Scratch::Data(fe, quadrature), Assembly::Copy::Data (false), 2*MultithreadInfo::n_threads(), diff --git a/tests/trilinos/assemble_matrix_parallel_05.cc b/tests/trilinos/assemble_matrix_parallel_05.cc index 0fcf5e33d6..4d3e712c92 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_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); + (std::bind(&LaplaceProblem::get_conflict_indices, this,std::placeholders::_1))); IndexSet locally_owned = dof_handler.locally_owned_dofs(); { @@ -368,16 +368,16 @@ void LaplaceProblem::assemble_test () WorkStream:: run (graph, - std_cxx11::bind (&LaplaceProblem:: - local_assemble, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind (&LaplaceProblem:: - copy_local_to_global, - this, - std_cxx11::_1), + std::bind (&LaplaceProblem:: + local_assemble, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind (&LaplaceProblem:: + copy_local_to_global, + this, + std::placeholders::_1), Assembly::Scratch::Data(fe, quadrature), Assembly::Copy::Data (false), 2*MultithreadInfo::n_threads(), diff --git a/tests/trilinos/assemble_matrix_parallel_06.cc b/tests/trilinos/assemble_matrix_parallel_06.cc index 4e5e002b11..20d95e8718 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_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); + (std::bind(&LaplaceProblem::get_conflict_indices, this,std::placeholders::_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_cxx11::bind (&LaplaceProblem:: - local_assemble, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind (&LaplaceProblem:: - copy_local_to_global, - this, - std_cxx11::_1), + std::bind (&LaplaceProblem:: + local_assemble, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind (&LaplaceProblem:: + copy_local_to_global, + this, + std::placeholders::_1), Assembly::Scratch::Data(fe, quadrature), Assembly::Copy::Data (false), 2*MultithreadInfo::n_threads(), diff --git a/tests/trilinos/assemble_matrix_parallel_07.cc b/tests/trilinos/assemble_matrix_parallel_07.cc index 88d92bbebf..b80ed5fa03 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_cxx11::bind(&LaplaceProblem::get_conflict_indices, this,std_cxx11::_1))); + (std::bind(&LaplaceProblem::get_conflict_indices, this,std::placeholders::_1))); IndexSet locally_owned = dof_handler.locally_owned_dofs(); { @@ -375,16 +375,16 @@ void LaplaceProblem::assemble_test () WorkStream:: run (graph, - std_cxx11::bind (&LaplaceProblem:: - local_assemble, - this, - std_cxx11::_1, - std_cxx11::_2, - std_cxx11::_3), - std_cxx11::bind (&LaplaceProblem:: - copy_local_to_global, - this, - std_cxx11::_1), + std::bind (&LaplaceProblem:: + local_assemble, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3), + std::bind (&LaplaceProblem:: + copy_local_to_global, + this, + std::placeholders::_1), Assembly::Scratch::Data(fe, quadrature), Assembly::Copy::Data (false), 2*MultithreadInfo::n_threads(), diff --git a/tests/trilinos/block_vector_iterator_03.cc b/tests/trilinos/block_vector_iterator_03.cc index 07ab49c978..c37fbe25dc 100644 --- a/tests/trilinos/block_vector_iterator_03.cc +++ b/tests/trilinos/block_vector_iterator_03.cc @@ -179,9 +179,9 @@ void test () // check std::transform std::transform (v1.begin(), v1.end(), v2.begin(), - std_cxx11::bind (std::multiplies(), - std_cxx11::_1, - 2.0)); + std::bind (std::multiplies(), + std::placeholders::_1, + 2.0)); v2 *= 1./2.; deallog << "Check 7: " << (v1 == v2 ? "true" : "false") << std::endl; -- 2.39.5