From 1b283397ad6415d96c5ec8d82cae82189aa24b25 Mon Sep 17 00:00:00 2001 From: heister Date: Sun, 3 Nov 2013 20:43:28 +0000 Subject: [PATCH] fix compilation on intel 13.1 git-svn-id: https://svn.dealii.org/trunk@31537 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/dofs/dof_tools_constraints.cc | 22 +++-- .../numerics/derivative_approximation.cc | 2 +- deal.II/source/numerics/matrix_tools.cc | 84 +++++++++---------- 3 files changed, 57 insertions(+), 51 deletions(-) diff --git a/deal.II/source/dofs/dof_tools_constraints.cc b/deal.II/source/dofs/dof_tools_constraints.cc index 9dabf622e9..acc7ba92b1 100644 --- a/deal.II/source/dofs/dof_tools_constraints.cc +++ b/deal.II/source/dofs/dof_tools_constraints.cc @@ -2344,12 +2344,22 @@ namespace DoFTools WorkStream::run(coarse_grid.begin_active(),coarse_grid.end(), static_cast ::active_cell_iterator const &,Assembler::Scratch const &,Assembler::CopyData - &)> > (std_cxx1x::bind(compute_intergrid_weights_3,std_cxx1x::_1,std_cxx1x::_2, - std_cxx1x::_3,std_cxx1x::cref(coarse_grid.get_fe()),std_cxx1x::cref(coarse_to_fine_grid_map), - std_cxx1x::cref(parameter_dofs))), static_cast const &)> > (std_cxx1x::bind(copy_intergrid_weights_3, - std_cxx1x::_1,std_cxx1x::cref(coarse_grid.get_fe()),std_cxx1x::ref(weights))),scratch, - copy_data); + &)> > ( + std_cxx1x::bind(&compute_intergrid_weights_3, + std_cxx1x::_1, + std_cxx1x::_2, + std_cxx1x::_3, + std_cxx1x::cref(coarse_grid.get_fe()), + std_cxx1x::cref(coarse_to_fine_grid_map), + std_cxx1x::cref(parameter_dofs))), + static_cast const &)> > ( + std_cxx1x::bind(©_intergrid_weights_3, + std_cxx1x::_1, + std_cxx1x::cref(coarse_grid.get_fe()), + std_cxx1x::ref(weights))), + scratch, + copy_data); } diff --git a/deal.II/source/numerics/derivative_approximation.cc b/deal.II/source/numerics/derivative_approximation.cc index a3311a4961..e1358c3abb 100644 --- a/deal.II/source/numerics/derivative_approximation.cc +++ b/deal.II/source/numerics/derivative_approximation.cc @@ -663,7 +663,7 @@ approximate_derivative (const Mapping &mapping, WorkStream::run(begin,end, static_cast const&, internal::Assembler::Scratch const&,internal::Assembler::CopyData &)> > - (std_cxx1x::bind(DerivativeApproximation::template approximate, std_cxx1x::_1, std_cxx1x::cref(mapping), diff --git a/deal.II/source/numerics/matrix_tools.cc b/deal.II/source/numerics/matrix_tools.cc index 054d623452..0423f1f794 100644 --- a/deal.II/source/numerics/matrix_tools.cc +++ b/deal.II/source/numerics/matrix_tools.cc @@ -1228,17 +1228,21 @@ namespace MatrixCreator static_cast::active_cell_iterator const &,MatrixCreator::internal::AssemblerBoundary::Scratch const &, MatrixCreator::internal::AssemblerBoundary::CopyData > &)> > - (std_cxx1x::bind(create_boundary_mass_matrix_1,std_cxx1x::_1,std_cxx1x::_2, + (std_cxx1x::bind(&create_boundary_mass_matrix_1,std_cxx1x::_1,std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::cref(mapping),std_cxx1x::cref(fe),std_cxx1x::cref(q), std_cxx1x::cref(boundary_functions),coefficient, std_cxx1x::cref(component_mapping))), static_cast > const &)> > (std_cxx1x::bind( - copy_boundary_mass_matrix_1,std_cxx1x::_1, - std_cxx1x::cref(boundary_functions),std_cxx1x::cref(dof_to_boundary_mapping), - std_cxx1x::ref(matrix),std_cxx1x::ref(rhs_vector))), - scratch,copy_data); + ©_boundary_mass_matrix_1, + std_cxx1x::_1, + std_cxx1x::cref(boundary_functions), + std_cxx1x::cref(dof_to_boundary_mapping), + std_cxx1x::ref(matrix), + std_cxx1x::ref(rhs_vector))), + scratch, + copy_data); } @@ -1639,17 +1643,21 @@ namespace MatrixCreator static_cast::active_cell_iterator const &,MatrixCreator::internal::AssemblerBoundary::Scratch const &, MatrixCreator::internal::AssemblerBoundary::CopyData > &)> > - (std_cxx1x::bind(create_hp_boundary_mass_matrix_1,std_cxx1x::_1,std_cxx1x::_2, + (std_cxx1x::bind( &create_hp_boundary_mass_matrix_1,std_cxx1x::_1,std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::cref(mapping),std_cxx1x::cref(fe_collection),std_cxx1x::cref(q), std_cxx1x::cref(boundary_functions),coefficient, std_cxx1x::cref(component_mapping))), - static_cast > const &)> > (std_cxx1x::bind( - copy_hp_boundary_mass_matrix_1,std_cxx1x::_1, - std_cxx1x::cref(boundary_functions),std_cxx1x::cref(dof_to_boundary_mapping), - std_cxx1x::ref(matrix),std_cxx1x::ref(rhs_vector))), - scratch,copy_data); + static_cast > const &)> > ( + std_cxx1x::bind( ©_hp_boundary_mass_matrix_1, + std_cxx1x::_1, + std_cxx1x::cref(boundary_functions), + std_cxx1x::cref(dof_to_boundary_mapping), + std_cxx1x::ref(matrix), + std_cxx1x::ref(rhs_vector))), + scratch, + copy_data); } @@ -1700,17 +1708,14 @@ namespace MatrixCreator copy_data.dof_indices.resize (assembler_data.fe_collection.max_dofs_per_cell()); copy_data.constraints = &constraints; - void (*copy_local_to_global) (const MatrixCreator::internal::AssemblerData::CopyData &, - SparseMatrix *, - Vector *) - = &MatrixCreator::internal:: - copy_local_to_global, Vector >; - WorkStream::run (dof.begin_active(), static_cast::active_cell_iterator>(dof.end()), &MatrixCreator::internal::laplace_assembler::active_cell_iterator>, - std_cxx1x::bind (copy_local_to_global, - std_cxx1x::_1, &matrix, (Vector *)0), + std_cxx1x::bind (&MatrixCreator::internal:: + copy_local_to_global, Vector >, + std_cxx1x::_1, + &matrix, + (Vector *)NULL), assembler_data, copy_data); } @@ -1760,17 +1765,14 @@ namespace MatrixCreator copy_data.dof_indices.resize (assembler_data.fe_collection.max_dofs_per_cell()); copy_data.constraints = &constraints; - void (*copy_local_to_global) (const MatrixCreator::internal::AssemblerData::CopyData &, - SparseMatrix *, - Vector *) - = &MatrixCreator::internal:: - copy_local_to_global, Vector >; - WorkStream::run (dof.begin_active(), static_cast::active_cell_iterator>(dof.end()), &MatrixCreator::internal::laplace_assembler::active_cell_iterator>, - std_cxx1x::bind (copy_local_to_global, - std_cxx1x::_1, &matrix, &rhs_vector), + std_cxx1x::bind (&MatrixCreator::internal:: + copy_local_to_global, Vector >, + std_cxx1x::_1, + &matrix, + &rhs_vector), assembler_data, copy_data); } @@ -1818,17 +1820,14 @@ namespace MatrixCreator copy_data.dof_indices.resize (assembler_data.fe_collection.max_dofs_per_cell()); copy_data.constraints = &constraints; - void (*copy_local_to_global) (const MatrixCreator::internal::AssemblerData::CopyData &, - SparseMatrix *, - Vector *) - = &MatrixCreator::internal:: - copy_local_to_global, Vector >; - WorkStream::run (dof.begin_active(), static_cast::active_cell_iterator>(dof.end()), &MatrixCreator::internal::laplace_assembler::active_cell_iterator>, - std_cxx1x::bind (copy_local_to_global, - std_cxx1x::_1, &matrix, (Vector *)0), + std_cxx1x::bind (&MatrixCreator::internal:: + copy_local_to_global, Vector >, + std_cxx1x::_1, + &matrix, + (Vector *)0), assembler_data, copy_data); } @@ -1875,17 +1874,14 @@ namespace MatrixCreator copy_data.dof_indices.resize (assembler_data.fe_collection.max_dofs_per_cell()); copy_data.constraints = &constraints; - void (*copy_local_to_global) (const MatrixCreator::internal::AssemblerData::CopyData &, - SparseMatrix *, - Vector *) - = &MatrixCreator::internal:: - copy_local_to_global, Vector >; - WorkStream::run (dof.begin_active(), static_cast::active_cell_iterator>(dof.end()), &MatrixCreator::internal::laplace_assembler::active_cell_iterator>, - std_cxx1x::bind (copy_local_to_global, - std_cxx1x::_1, &matrix, &rhs_vector), + std_cxx1x::bind (&MatrixCreator::internal:: + copy_local_to_global, Vector >, + std_cxx1x::_1, + &matrix, + &rhs_vector), assembler_data, copy_data); } -- 2.39.5