Merge trunk into branch_port_the_testsuite

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31294 0785d39b-7218-0410-832d-ea1e28bc413d

diff --cc deal.II/examples/step-13/step-13.cc
index eea40b8811f141e0c9afb5c04c692acfb86f3791,eea40b8811f141e0c9afb5c04c692acfb86f3791..d2b2693b4b27a2a086a8442531349c2e1e3e8aa1
--- 1/deal.II/examples/step-13/step-13.cc
--- 2/deal.II/examples/step-13/step-13.cc
+++ b/deal.II/examples/step-13/step-13.cc
@@@ -775,8 -775,8 +775,8 @@@ namespace Step1
        Assembler::Scratch scratch;
        Assembler::CopyData copy_data;
        WorkStream::run(dof_handler.begin_active(),dof_handler.end(),
--          std::bind(&Solver<dim>::assemble_matrix,this,std_cxx1x::_1,std_cxx1x::_2,std_cxx1x::_3),
--          std::bind(&Solver<dim>::copy_local_to_global,this,std_cxx1x::_1,std_cxx1x::ref(linear_system)),
++          std_cxx1x::bind(&Solver<dim>::assemble_matrix,this,std_cxx1x::_1,std_cxx1x::_2,std_cxx1x::_3),
++          std_cxx1x::bind(&Solver<dim>::copy_local_to_global,this,std_cxx1x::_1,std_cxx1x::ref(linear_system)),
            scratch,copy_data);
  
        // While the new threads assemble the system matrix, we can already

diff --cc deal.II/examples/step-14/step-14.cc
index 934e0a9dd3dd815e71c6c82427e8e778a0745672,934e0a9dd3dd815e71c6c82427e8e778a0745672..575dfe9469484d32d2d500f9ac26b44d245f5f3e
--- 1/deal.II/examples/step-14/step-14.cc
--- 2/deal.II/examples/step-14/step-14.cc
+++ b/deal.II/examples/step-14/step-14.cc
@@@ -575,8 -575,8 +575,8 @@@ namespace Step1
        Assembler::Scratch scratch;
        Assembler::CopyData copy_data;
        WorkStream::run(dof_handler.begin_active(),dof_handler.end(),
--          std::bind(&Solver<dim>::assemble_matrix,this,std_cxx1x::_1,std_cxx1x::_2,std_cxx1x::_3),
--          std::bind(&Solver<dim>::copy_local_to_global,this,std_cxx1x::_1,std_cxx1x::ref(linear_system)),
++          std_cxx1x::bind(&Solver<dim>::assemble_matrix,this,std_cxx1x::_1,std_cxx1x::_2,std_cxx1x::_3),
++          std_cxx1x::bind(&Solver<dim>::copy_local_to_global,this,std_cxx1x::_1,std_cxx1x::ref(linear_system)),
            scratch,copy_data);