From: Wolfgang Bangerth Date: Mon, 23 Mar 1998 09:06:57 +0000 (+0000) Subject: Remove some clutter needed for gcc2.7.2.3 X-Git-Tag: v8.0.0~23161 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d94735a579c4371e5aa8391887d3b4b9b363df28;p=dealii.git Remove some clutter needed for gcc2.7.2.3 git-svn-id: https://svn.dealii.org/trunk@90 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/source/quadrature_lib.cc b/deal.II/base/source/quadrature_lib.cc index 0b38e6e7d2..f2e64ccdf2 100644 --- a/deal.II/base/source/quadrature_lib.cc +++ b/deal.II/base/source/quadrature_lib.cc @@ -547,7 +547,7 @@ QGauss8<1>::QGauss8 () : QMidpoint<1>::QMidpoint () : Quadrature<1>(1) { - quadrature_points[0] = 0.5; + quadrature_points[0] = Point<1>(0.5); weights[0] = 1.0; }; diff --git a/deal.II/deal.II/include/dofs/dof_accessor.h b/deal.II/deal.II/include/dofs/dof_accessor.h index 57cad67c7f..aa74ccb7a4 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.h @@ -260,11 +260,6 @@ class DoFQuadAccessor : public BaseClass, public DoFAccessor { -extern DoFLineAccessor<1,LineAccessor<1> > __dummy215; // for gcc2.7 -extern DoFLineAccessor<1,CellAccessor<1> > __dummy216; -extern DoFLineAccessor<2,LineAccessor<2> > __dummy217; -extern DoFQuadAccessor<2,QuadAccessor<2> > __dummy218; -extern DoFQuadAccessor<2,CellAccessor<2> > __dummy219; @@ -394,8 +389,6 @@ class DoFCellAccessor : public DoFSubstructAccessor { -extern DoFCellAccessor<1> __dummy17; //do this to calm down gcc2.7.. wait for gcc2.8 -extern DoFCellAccessor<2> __dummy18; diff --git a/deal.II/deal.II/include/dofs/dof_handler.h b/deal.II/deal.II/include/dofs/dof_handler.h index e8fcc9713f..f660cb4ad3 100644 --- a/deal.II/deal.II/include/dofs/dof_handler.h +++ b/deal.II/deal.II/include/dofs/dof_handler.h @@ -1001,8 +1001,6 @@ class DoFHandler : public DoFDimensionInfo { }; -extern DoFHandler<1> __dummy10123; // do this to calm down gcc2.7; wait for gcc2.8 -extern DoFHandler<2> __dummy10124; diff --git a/deal.II/deal.II/include/grid/tria_accessor.h b/deal.II/deal.II/include/grid/tria_accessor.h index 492b049d47..6e7871a381 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.h +++ b/deal.II/deal.II/include/grid/tria_accessor.h @@ -257,8 +257,6 @@ class TriaAccessor { -extern TriaAccessor<1> __dummy1; // to calm down gcc2.7 -extern TriaAccessor<2> __dummy2; // to calm down gcc2.7 diff --git a/deal.II/deal.II/include/grid/tria_iterator.h b/deal.II/deal.II/include/grid/tria_iterator.h index 9521b5a2c6..1d14bf0c60 100644 --- a/deal.II/deal.II/include/grid/tria_iterator.h +++ b/deal.II/deal.II/include/grid/tria_iterator.h @@ -539,9 +539,6 @@ class TriaIterator : public TriaRawIterator { -extern TriaIterator<1,LineAccessor<1> > __dummy3; // to calm down gcc2.7 -extern TriaIterator<2,LineAccessor<2> > __dummy4; // to calm down gcc2.7 -extern TriaIterator<2,QuadAccessor<2> > __dummy5; // to calm down gcc2.7 diff --git a/deal.II/deal.II/source/dofs/dof_accessor.cc b/deal.II/deal.II/source/dofs/dof_accessor.cc index b7c0c6c181..cc905ae674 100644 --- a/deal.II/deal.II/source/dofs/dof_accessor.cc +++ b/deal.II/deal.II/source/dofs/dof_accessor.cc @@ -8,12 +8,6 @@ #include -extern TriaIterator<1,DoFCellAccessor<1> > __dummy257; //do this to calm down gcc2.7, -extern TriaIterator<2,DoFCellAccessor<2> > __dummy258; //wait for gcc2.8 -extern TriaIterator<1,DoFLineAccessor<1,CellAccessor<1> > > __dummy259; -extern TriaIterator<2,DoFQuadAccessor<2,QuadAccessor<2> > > __dummy260; -extern TriaIterator<2,DoFQuadAccessor<2,CellAccessor<2> > > __dummy261; - @@ -278,9 +272,6 @@ DoFCellAccessor<1>::dof_indices (vector &dof_indices) const { -// do this to calm down gcc2.7; wait for gcc2.8 -extern TriaIterator<2,DoFLineAccessor<2,LineAccessor<2> > > __dummya; - void DoFCellAccessor<2>::dof_indices (vector &dof_indices) const { @@ -298,6 +289,9 @@ DoFCellAccessor<2>::dof_indices (vector &dof_indices) const { }; + + + // explicit instantiations template class DoFLineAccessor<1,CellAccessor<1> >; template class DoFCellAccessor<1>; diff --git a/deal.II/deal.II/source/dofs/dof_handler.cc b/deal.II/deal.II/source/dofs/dof_handler.cc index a1c040bb48..b172bab594 100644 --- a/deal.II/deal.II/source/dofs/dof_handler.cc +++ b/deal.II/deal.II/source/dofs/dof_handler.cc @@ -11,41 +11,6 @@ #include -extern TriaRawIterator<1,LineAccessor<1> > _dummy112; -extern TriaRawIterator<2,LineAccessor<2> > _dummy113; -extern TriaIterator<1,LineAccessor<1> > _dummy114; -extern TriaIterator<2,LineAccessor<2> > _dummy115; -extern TriaActiveIterator<1,LineAccessor<1> > _dummy116; -extern TriaActiveIterator<2,LineAccessor<2> > _dummy117; - -extern TriaRawIterator<2,QuadAccessor<2> > _dummy118; -extern TriaIterator<2,QuadAccessor<2> > _dummy119; -extern TriaActiveIterator<2,QuadAccessor<2> > _dummy120; - -extern TriaRawIterator<1,CellAccessor<1> > _dummy121; -extern TriaRawIterator<2,CellAccessor<2> > _dummy122; -extern TriaIterator<1,CellAccessor<1> > _dummy123; -extern TriaIterator<2,CellAccessor<2> > _dummy124; -extern TriaActiveIterator<1,CellAccessor<1> > _dummy125; -extern TriaActiveIterator<2,CellAccessor<2> > _dummy126; - -extern DoFCellAccessor<1> _dummy127; //do this to calm down gcc2.7 -extern TriaRawIterator<1,DoFCellAccessor<1> > _dummy128; //wait for gcc2.8 -extern TriaIterator<1,DoFCellAccessor<1> > _dummy129; -extern TriaActiveIterator<1,DoFCellAccessor<1> > _dummy130; - -extern DoFCellAccessor<2> _dummy131; //do this to calm down gcc2.7 -extern TriaRawIterator<2,DoFLineAccessor<2,LineAccessor<2> > > _dummy132; //wait for gcc2.8 -extern TriaIterator<2,DoFLineAccessor<2,LineAccessor<2> > > _dummy133; -extern TriaActiveIterator<2,DoFLineAccessor<2,LineAccessor<2> > > _dummy134; -extern TriaRawIterator<2,DoFCellAccessor<2> > _dummy135; //wait for gcc2.8 -extern TriaIterator<2,DoFCellAccessor<2> > _dummy136; -extern TriaActiveIterator<2,DoFCellAccessor<2> > _dummy137; - -extern Triangulation<1> _dummy138; -extern Triangulation<2> _dummy139; - - template DoFHandler::DoFHandler (Triangulation *tria) : diff --git a/deal.II/deal.II/source/fe/fe.cc b/deal.II/deal.II/source/fe/fe.cc index c2e1434359..97f560712a 100644 --- a/deal.II/deal.II/source/fe/fe.cc +++ b/deal.II/deal.II/source/fe/fe.cc @@ -5,8 +5,6 @@ #include #include -extern TriaIterator<1,CellAccessor<1> > __dummy2687; // for gcc2.8 - /*------------------------------- FEValues -------------------------------*/ diff --git a/deal.II/deal.II/source/fe/fe_lib.linear.cc b/deal.II/deal.II/source/fe/fe_lib.linear.cc index 7edaae69ee..d0a167698b 100644 --- a/deal.II/deal.II/source/fe/fe_lib.linear.cc +++ b/deal.II/deal.II/source/fe/fe_lib.linear.cc @@ -4,9 +4,6 @@ #include #include -extern TriaIterator<1,CellAccessor<1> > __dummy2687; // for gcc2.8 -extern TriaIterator<2,CellAccessor<2> > __dummy2688; // for gcc2.8 - FELinear<1>::FELinear () : FiniteElement<1> (1, 0) diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc index 0a757181b7..1b76c32dc4 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -9,6 +9,9 @@ #include #include + + + template Triangulation::Triangulation () { static StraightBoundary default_boundary; diff --git a/deal.II/deal.II/source/numerics/assembler.cc b/deal.II/deal.II/source/numerics/assembler.cc index 0153753146..f425dc6606 100644 --- a/deal.II/deal.II/source/numerics/assembler.cc +++ b/deal.II/deal.II/source/numerics/assembler.cc @@ -8,9 +8,6 @@ #include -extern TriaIterator<1,CellAccessor<1> > __dummy127; // do this to calm down gcc2.7, -extern TriaIterator<2,CellAccessor<2> > __dummy128; // wait for gcc2.8 - template Equation::Equation (const unsigned int n_equations) : diff --git a/deal.II/deal.II/source/numerics/base.cc b/deal.II/deal.II/source/numerics/base.cc index ae4c3ef118..0874fd4a50 100644 --- a/deal.II/deal.II/source/numerics/base.cc +++ b/deal.II/deal.II/source/numerics/base.cc @@ -15,9 +15,6 @@ -extern TriaActiveIterator<1,CellAccessor<1> > __dummy1233; // for gcc2.7 -extern TriaActiveIterator<2,CellAccessor<2> > __dummy1234; - template diff --git a/deal.II/deal.II/source/numerics/data_io.cc b/deal.II/deal.II/source/numerics/data_io.cc index d610124da0..493d6715c4 100644 --- a/deal.II/deal.II/source/numerics/data_io.cc +++ b/deal.II/deal.II/source/numerics/data_io.cc @@ -11,11 +11,6 @@ #include -extern TriaActiveIterator<1,DoFCellAccessor<1> > __dummy566; // wait for gcc2.8 -extern TriaActiveIterator<2,DoFCellAccessor<2> > __dummy567; - - -