From: Wolfgang Bangerth Date: Thu, 19 Mar 1998 16:01:34 +0000 (+0000) Subject: Change some things for gcc2.8 X-Git-Tag: v8.0.0~23164 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31d89197f8dcdf31f798b9cef212d7d8bfe121b3;p=dealii.git Change some things for gcc2.8 git-svn-id: https://svn.dealii.org/trunk@87 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/source/Makefile b/deal.II/lac/source/Makefile index 42b819f97a..d42103aaa5 100644 --- a/deal.II/lac/source/Makefile +++ b/deal.II/lac/source/Makefile @@ -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)) diff --git a/deal.II/lac/source/dfmatrix.cc b/deal.II/lac/source/dfmatrix.cc index be78ab990e..d9ee8a35c1 100644 --- a/deal.II/lac/source/dfmatrix.cc +++ b/deal.II/lac/source/dfmatrix.cc @@ -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; diff --git a/deal.II/lac/source/dvector.cc b/deal.II/lac/source/dvector.cc index b32d3d3b08..2fab74b805 100644 --- a/deal.II/lac/source/dvector.cc +++ b/deal.II/lac/source/dvector.cc @@ -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; i0, 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;