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 d2819a894743c62481c4b2d01b5b3cfe7f92560c..9341eaaa3232be21ceafd2dc4203b6c11335c24f 100644 (file)
--- 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<dim>::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 729794593ac71abc080da1f29b14406bac5bc43b..e4f91bd1b37e9b462f6840c2cfacf4f0af596cf1 100644 (file)
--- a/deal.II/doc/news/changes.h
+++ b/deal.II/doc/news/changes.h
@@ -39,9 +39,10 @@ inconvenience this causes.
 
 <ol>
   <li>
-  <p>Fixed: GCC version 3.3.x failed to compile the file
-  <code>lac/include/lac/precondition_block.h</code>. This problem has now been
-  worked around.
+  <p>Fixed: GCC version 3.3.x failed to compile the files
+  <code>lac/include/lac/precondition_block.h</code> and
+  <code>deal.II/source/multigrid/mg_dof_handler.cc</code>. This problem has
+  now been worked around.
   <br>
   (WB 2010/07/12)
   </p>