]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Change some things for gcc2.8
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Thu, 19 Mar 1998 16:01:34 +0000 (16:01 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Thu, 19 Mar 1998 16:01:34 +0000 (16:01 +0000)
git-svn-id: https://svn.dealii.org/trunk@87 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/source/Makefile
deal.II/lac/source/dfmatrix.cc
deal.II/lac/source/dvector.cc
deal.II/lac/source/ivector.cc

index 42b819f97a7a1af35dcecb9cd825aa00b24679c2..d42103aaa57f930b4961840a84f4a07bad037835 100644 (file)
@@ -8,8 +8,12 @@ CXXFLAGS  =-O3 -Wuninitialized -finline-functions -ffast-math \
            -funroll-loops -felide-constructors -fnonnull-objects $(INCLUDE)
 
 ifeq ($(shell uname),SunOS)
-CXXFLAGS  := -V2.7.2.3 $(CXXFLAGS)
-CXXFLAGS.g:= -V2.7.2.3 $(CXXFLAGS.g)
+#CXXFLAGS  := -V2.7.2.3 $(CXXFLAGS)
+#CXXFLAGS.g:= -V2.7.2.3 $(CXXFLAGS.g)
+INCLUDE2.8  =  -I/usr/local/source/libstdc++-2.8.0/libstdc++ \
+               -I/usr/local/source/libstdc++-2.8.0/libio
+CXXFLAGS  := $(CXXFLAGS) -fno-rtti -fno-exceptions $(INCLUDE2.8)
+CXXFLAGS.g:= $(CXXFLAGS.g) -W -fno-rtti -fno-exceptions $(INCLUDE2.8)
 endif
 
 
@@ -31,6 +35,7 @@ h-files  = $(wildcard ../include/*/*.h)
 
 lib: lib.g.a lib.a
 
+
 lib.a: ../lib/liblac.a($(o-files))
 
 lib.g.a: ../lib/liblac.g.a($(go-files))
index be78ab990e19665461e4bfcd125e4179b4901117..d9ee8a35c1315b97b645cd3a79398afbe5f07f23 100644 (file)
@@ -9,7 +9,7 @@
 
 
 
-dFMatrix::dFMatrix (const dFMatrix &m)
+dFMatrix::dFMatrix (const dFMatrix &m) 
 {
   init (m.dim_image, m.dim_range);
   for (int i=0; i!=dim_image*dim_range; ++i)
@@ -941,7 +941,7 @@ void dFMatrix::invert (const dFMatrix &M) {
                        t01 = M.el(0,1)*M.el(2,0),
                        t04 = M.el(0,2)*M.el(2,0),
                        t07 = 1.0/(t4*M.el(2,2)-t6*M.el(2,1)-t8*M.el(2,2)+
-                                  t00*M.el(2,1)+t01*M.el(1,2)-t04*M.el(1,1));
+                                  t00*M.el(2,1)+t01*M.el(1,2)-t04*M.el(1,1));
            el(0,0) = (M.el(1,1)*M.el(2,2)-M.el(1,2)*M.el(2,1))*t07;
            el(0,1) = -(M.el(0,1)*M.el(2,2)-M.el(0,2)*M.el(2,1))*t07;
            el(0,2) = -(-M.el(0,1)*M.el(1,2)+M.el(0,2)*M.el(1,1))*t07;
index b32d3d3b08f6bc72f44b781b9280fee08d386c5b..2fab74b8057cd70cb06b72c5573ccec17fcc841e 100644 (file)
@@ -14,28 +14,28 @@ dVector::dVector() :
 {}
 
 
-dVector::dVector(int n)
+dVector::dVector(int n) :
+               dim(n),
+               maxdim(n),
+               val(0)
 {
   Assert (n>0, ExcInvalidNumber(n));
 
-  dim = n;
-  maxdim = n;
   if (n)
     {
       val = new double[maxdim];
       Assert (val != 0, ExcOutOfMemory());
       clear ();
     }
-  else
-    val = 0;
 }
 
 
-dVector::dVector(const dVector& v)
+dVector::dVector(const dVector& v) :
+               VectorBase(v),
+               dim(v.n()),
+               maxdim(v.n()),
+               val(0)
 {
-  dim = v.n();
-  maxdim = v.n();
-
   if (dim)
     {
       val = new double[maxdim];
@@ -43,8 +43,6 @@ dVector::dVector(const dVector& v)
       for (int i=0; i<dim; i++)
        val[i] = v.val[i];
     }
-  else
-    val = 0;
 }
 
 
index 75cd8cf3d88f36726ac656fe936d8a8d266f9065..6c97eead2db046b0e239da60fc1841cf4c8b44e3 100644 (file)
@@ -8,27 +8,32 @@
 
 
 
-iVector::iVector()
+iVector::iVector() :
+               dim(1),
+               maxdim(1),
+               val(new int[1])
 {
-  dim=maxdim=1;
-  val = new int[1];
   Assert (val != 0, ExcOutOfMemory());
   clear ();
 }
 
-iVector::iVector(int n)
+
+iVector::iVector(int n) :
+               dim(n),
+               maxdim(n),
+               val(new int[n])
 {
   Assert (n>0, ExcInvalidNumber(n));
 
-  dim = n;
-  maxdim = n;
-  val = new int[maxdim];
   Assert (val != 0, ExcOutOfMemory());
   clear ();
 }
 
 
-iVector::iVector(const iVector& v)
+iVector::iVector(const iVector& v) :
+               dim(v.dim),
+               maxdim(v.maxdim),
+               val(0)
 {
   reinit(v.dim,1);
   int i;
@@ -43,7 +48,7 @@ void iVector::reinit(int n, int fast)
   Assert (n>0, ExcInvalidNumber(n));
   if (n>maxdim)
   {
-    delete[] val;
+    if (val != 0) delete[] val;
     val = new int[n];
     Assert (val != 0, ExcOutOfMemory());
     maxdim = n;

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.