From: wolf Date: Wed, 6 Aug 2003 14:14:26 +0000 (+0000) Subject: Dont be overly conservative with template instantiatio depth. Remove some stray semic... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=191873749854fcfff735cc39d96cceda23a2c379;p=dealii-svn.git Dont be overly conservative with template instantiatio depth. Remove some stray semicolons that lead to wrong autoconf test results. git-svn-id: https://svn.dealii.org/trunk@7904 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 1b2e025345..db3c925df9 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -245,8 +245,8 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl [ dnl First the flags for gcc compilers if test "$GXX" = yes ; then - CXXFLAGSO="$CXXFLAGS -O2 -Wuninitialized -felide-constructors -ftemplate-depth-32" - CXXFLAGSG="$CXXFLAGS -DDEBUG -pedantic -Wall -W -Wpointer-arith -Wwrite-strings -Winline -Woverloaded-virtual -Wsynth -Wsign-compare -Wconversion -Wswitch -ftemplate-depth-32" + CXXFLAGSO="$CXXFLAGS -O2 -Wuninitialized -felide-constructors -ftemplate-depth-128" + CXXFLAGSG="$CXXFLAGS -DDEBUG -pedantic -Wall -W -Wpointer-arith -Wwrite-strings -Winline -Woverloaded-virtual -Wsynth -Wsign-compare -Wconversion -Wswitch -ftemplate-depth-128" dnl BOOST uses long long, so don't warn about this CXXFLAGSG="$CXXFLAGSG -Wno-long-long" @@ -1601,7 +1601,7 @@ void __IssueError_Assert (const char *file, std::cerr << "--------------------------------------------------------" << std::endl; std::abort (); -}; +} template void __IssueError_Throw (const char *file, @@ -1613,7 +1613,7 @@ void __IssueError_Throw (const char *file, // Fill the fields of the exception object e.SetFields (file, line, function, cond, exc_name); throw e; -}; +} #define AssertThrow(cond, exc) \ { \ @@ -1629,7 +1629,7 @@ class Exception0 : public ExceptionBase {} namespace StandardExceptions { DeclException0 (ExcInternalError); -}; +} using namespace StandardExceptions; ], [ diff --git a/deal.II/configure b/deal.II/configure index 8f8094ee93..d269a55fdc 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -2862,8 +2862,8 @@ echo "$as_me: error: Unrecognized compiler -- sorry" >&2;} if test "$GXX" = yes ; then - CXXFLAGSO="$CXXFLAGS -O2 -Wuninitialized -felide-constructors -ftemplate-depth-32" - CXXFLAGSG="$CXXFLAGS -DDEBUG -pedantic -Wall -W -Wpointer-arith -Wwrite-strings -Winline -Woverloaded-virtual -Wsynth -Wsign-compare -Wconversion -Wswitch -ftemplate-depth-32" + CXXFLAGSO="$CXXFLAGS -O2 -Wuninitialized -felide-constructors -ftemplate-depth-128" + CXXFLAGSG="$CXXFLAGS -DDEBUG -pedantic -Wall -W -Wpointer-arith -Wwrite-strings -Winline -Woverloaded-virtual -Wsynth -Wsign-compare -Wconversion -Wswitch -ftemplate-depth-128" CXXFLAGSG="$CXXFLAGSG -Wno-long-long" @@ -3872,7 +3872,7 @@ void __IssueError_Assert (const char *file, std::cerr << "--------------------------------------------------------" << std::endl; std::abort (); -}; +} template void __IssueError_Throw (const char *file, @@ -3884,7 +3884,7 @@ void __IssueError_Throw (const char *file, // Fill the fields of the exception object e.SetFields (file, line, function, cond, exc_name); throw e; -}; +} #define AssertThrow(cond, exc) \ { \ @@ -3900,7 +3900,7 @@ class Exception0 : public ExceptionBase {} namespace StandardExceptions { DeclException0 (ExcInternalError); -}; +} using namespace StandardExceptions; int @@ -3998,7 +3998,7 @@ void __IssueError_Assert (const char *file, std::cerr << "--------------------------------------------------------" << std::endl; std::abort (); -}; +} template void __IssueError_Throw (const char *file, @@ -4010,7 +4010,7 @@ void __IssueError_Throw (const char *file, // Fill the fields of the exception object e.SetFields (file, line, function, cond, exc_name); throw e; -}; +} #define AssertThrow(cond, exc) \ { \ @@ -4026,7 +4026,7 @@ class Exception0 : public ExceptionBase {} namespace StandardExceptions { DeclException0 (ExcInternalError); -}; +} using namespace StandardExceptions; int