From 34e4ffa59451318ecc89f6aac26f28c703ec4973 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 3 Apr 2001 13:02:55 +0000 Subject: [PATCH] Two small changes to allow compilation with present gcc3 snapshots. git-svn-id: https://svn.dealii.org/trunk@4360 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/include/base/logstream.h | 3 ++- deal.II/base/include/base/tensor_base.h | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/deal.II/base/include/base/logstream.h b/deal.II/base/include/base/logstream.h index 21843f725b..cd9c44406c 100644 --- a/deal.II/base/include/base/logstream.h +++ b/deal.II/base/include/base/logstream.h @@ -311,7 +311,8 @@ LogStream::operator<< (std::ostream& (*p) (std::ostream&)) // next check whether this is the // @p{endl} manipulator, and if so // set a flag - if (p == &std::endl) + std::ostream & (* const p_endl) (std::ostream&) = &std::endl; + if (p == p_endl) was_endl = true; return *this; diff --git a/deal.II/base/include/base/tensor_base.h b/deal.II/base/include/base/tensor_base.h index 6b3de82437..fe4d70d116 100644 --- a/deal.II/base/include/base/tensor_base.h +++ b/deal.II/base/include/base/tensor_base.h @@ -78,9 +78,11 @@ class Tensor<1,dim> * * Avoid warning about zero-sized * array for @p{dim==0} by - * choosing lunatic value. + * choosing lunatic value that is + * likely to overflow memory + * limits. */ - typedef double array_type[(dim!=0) ? dim : (unsigned int)(-1)]; + typedef double array_type[(dim!=0) ? dim : 1000000000]; /** * Constructor. Initialize all entries -- 2.39.5