From: maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 18 Oct 2013 09:37:15 +0000 (+0000)
Subject: Merge trunk into branch_port_the_testsuite
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61c86acef3c0110810129c7a62d328b76d8c85f3;p=dealii-svn.git

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
---

61c86acef3c0110810129c7a62d328b76d8c85f3
diff --cc deal.II/examples/step-13/step-13.cc
index eea40b8811,eea40b8811..d2b2693b4b
--- a/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 934e0a9dd3,934e0a9dd3..575dfe9469
--- a/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);