]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Reapply the patch 1.2 -> 1.3
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 30 Jun 2005 15:14:55 +0000 (15:14 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 30 Jun 2005 15:14:55 +0000 (15:14 +0000)
git-svn-id: https://svn.dealii.org/trunk@10989 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/functionparser/fparser.cc

index ddc27ed5765a6ded3ac21c48d674930e37caf61b..4e9819d8465a56ce0a16a0f7c445c1b33a533c6c 100644 (file)
@@ -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

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.