Work around problems with gcc3

git-svn-id: https://svn.dealii.org/branches/Branch-3-1@4199 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/deal.II/include/grid/grid_reordering.h b/deal.II/deal.II/include/grid/grid_reordering.h
index 2d200b61b70738734646b0f54fef2d40439e08e4..8ac03fec3dfde2411837bfe71e53e0cddabf35f5 100644 (file)
--- a/deal.II/deal.II/include/grid/grid_reordering.h
+++ b/deal.II/deal.II/include/grid/grid_reordering.h
@@ -662,6 +662,13 @@ class GridReordering : private GridReorderingInfo<dim>
                                          */
        Cell (const CellData<dim> &cd,
              const unsigned int   cell_no);
+
+                                        /**
+                                         * Copy constructor to work
+                                         * around a bug in a gcc3.0
+                                         * snapshot.
+                                         */
+       Cell (const Cell &);
        
                                         /**
                                          * Count the existing neighbors

diff --git a/deal.II/deal.II/include/grid/tria_accessor.h b/deal.II/deal.II/include/grid/tria_accessor.h
index 8fe0b7ed4b9961dea34fe6b8f6c88765920cd8d7..b51db397d1ac637514d2aa775c535a1d55e89ec1 100644 (file)
--- a/deal.II/deal.II/include/grid/tria_accessor.h
+++ b/deal.II/deal.II/include/grid/tria_accessor.h
@@ -1986,10 +1986,8 @@ class CellAccessor :  public TriaObjectAccessor<dim,dim>
 
 
 
-// if in optimized mode: include more templates
-#ifndef DEBUG
+// include more templates in debug and optimized mode
 #  include "tria_accessor.templates.h"
-#endif
 
 
 #endif

diff --git a/deal.II/deal.II/source/grid/grid_reordering.cc b/deal.II/deal.II/source/grid/grid_reordering.cc
index 97f9034dee026a24f43edf2741f58c9a07d66497..04eeb04447976378cba879221b954b87d0ffe1ca 100644 (file)
--- a/deal.II/deal.II/source/grid/grid_reordering.cc
+++ b/deal.II/deal.II/source/grid/grid_reordering.cc
@@ -67,6 +67,20 @@ GridReordering<dim>::Cell::Cell (const CellData<dim> &cd,
 };
 
 
+template <int dim>
+GridReordering<dim>::Cell::Cell (const Cell &c) :
+               CellData<dim> (c),
+                cell_no(c.cell_no),
+                track_back_to_cell(c.track_back_to_cell)
+{
+  for (unsigned int i=0; i<GridReorderingInfo<dim>::rotational_states_of_cells; ++i)
+    for (unsigned int j=0; j<GeometryInfo<dim>::faces_per_cell; ++j)
+      faces[i][j]=c.faces[i][j];
+
+  for (unsigned int i=0; i<GeometryInfo<dim>::faces_per_cell; ++i)
+    neighbors[i]=c.neighbors[i];
+}
+
 
 template <int dim>
 inline