From: bangerth Date: Mon, 12 Jul 2010 22:02:18 +0000 (+0000) Subject: Take over patches 21475 and 21476 from mainline. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=235fda355cf84965ea47448bfb8dbbfbbdb5c0ad;p=dealii-svn.git Take over patches 21475 and 21476 from mainline. git-svn-id: https://svn.dealii.org/branches/releases/Branch-6-3@21477 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/multigrid/mg_dof_handler.cc b/deal.II/deal.II/source/multigrid/mg_dof_handler.cc index d2819a8947..9341eaaa32 100644 --- a/deal.II/deal.II/source/multigrid/mg_dof_handler.cc +++ b/deal.II/deal.II/source/multigrid/mg_dof_handler.cc @@ -569,7 +569,7 @@ namespace internal { const unsigned int dim = 2; - Assert (mg_dof_handler.selected_fe != 0, DoFHandler::ExcNoFESelected()); + Assert (mg_dof_handler.selected_fe != 0, DoFHandler<2>::ExcNoFESelected()); Assert (mg_dof_handler.tria->n_levels() > 0, DoFHandler<2>::ExcInvalidTriangulation()); //////////////////////////// diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index 729794593a..e4f91bd1b3 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -39,9 +39,10 @@ inconvenience this causes.
  1. -

    Fixed: GCC version 3.3.x failed to compile the file - lac/include/lac/precondition_block.h. This problem has now been - worked around. +

    Fixed: GCC version 3.3.x failed to compile the files + lac/include/lac/precondition_block.h and + deal.II/source/multigrid/mg_dof_handler.cc. This problem has + now been worked around.
    (WB 2010/07/12)