From: wolf Date: Thu, 30 Jun 2005 15:14:55 +0000 (+0000) Subject: Reapply the patch 1.2 -> 1.3 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6102cbf2bb956c80ef0a093a70899e9ff6ec137;p=dealii-svn.git Reapply the patch 1.2 -> 1.3 git-svn-id: https://svn.dealii.org/trunk@10989 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/functionparser/fparser.cc b/deal.II/contrib/functionparser/fparser.cc index ddc27ed576..4e9819d846 100644 --- a/deal.II/contrib/functionparser/fparser.cc +++ b/deal.II/contrib/functionparser/fparser.cc @@ -1399,10 +1399,6 @@ public: compres(char v) : state(v) {} // is it? operator bool() const { return state != 0; } - // is it not? - bool operator! () const { return state != 1; } - bool operator==(bool b) const { return state != !b; } - bool operator!=(bool b) const { return state != b; } private: char state; }; @@ -1507,10 +1503,8 @@ public: UpdateValue(); } - bool IsOriginal() const { return !(IsInverted() || IsNegated()); } bool IsInverted() const { return inverted; } bool IsNegated() const { return negated; } - bool IsInvertedOriginal() const { return IsInverted() && !IsNegated(); } bool IsNegatedOriginal() const { return !IsInverted() && IsNegated(); } private: @@ -1566,9 +1560,7 @@ public: return *this; } const CodeTreeData *operator-> () const { return &p->first; } - const CodeTreeData &operator* () const { return p->first; } CodeTreeData *operator-> () { PrepareForWrite(); return &p->first; } - CodeTreeData &operator* () { PrepareForWrite(); return p->first; } void Shock(); }; @@ -1606,7 +1598,6 @@ public: SubTree& getp0() { /*chk<1>();*/pit tmp=GetBegin(); return *tmp; } SubTree& getp1() { /*chk<2>();*/pit tmp=GetBegin(); ++tmp; return *tmp; } - SubTree& getp2() { /*chk<3>();*/pit tmp=GetBegin(); ++tmp; ++tmp; return *tmp; } // set void SetImmed(double v) { data->SetImmed(v); } @@ -1626,8 +1617,6 @@ public: compres NonZero() const { if(!IsImmed()) return maybe; return GetImmed() != 0.0; } - compres IsPositive() const { if(!IsImmed()) return maybe; - return GetImmed() > 0.0; } private: struct ConstList