Changeset 1936 for trunk/MagicSoft/Mars/mfilter

Timestamp:

04/10/03 10:43:24 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfilter

Files:

• MF.cc (modified) (1 diff)
• MFilterList.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mfilter/MF.cc

@@ -449 +449 @@
 Bool_t MF::IsExpressionTrue() const
 {
-    return fF->IsExpressionTrue();
+    return fF->IsConditionTrue();
 }
 

trunk/MagicSoft/Mars/mfilter/MFilterList.cc

@@ -105 +105 @@
         return kTRUE;
 
-    Bool_t rc = filter->IsExpressionTrue();
+    Bool_t rc = filter->IsConditionTrue();
 
     //
@@ -114 +114 @@
     case kEAnd:
         while ((filter=(MFilter*)Next()))
-            rc &= filter->IsExpressionTrue();
+            rc &= filter->IsConditionTrue();
         break;
 
     case kEOr:
         while ((filter=(MFilter*)Next()))
-            rc |= filter->IsExpressionTrue();
+            rc |= filter->IsConditionTrue();
         break;
 
     case kEXor:
         while ((filter=(MFilter*)Next()))
-            rc ^= filter->IsExpressionTrue();
+            rc ^= filter->IsConditionTrue();
         break;
 
     case kELAnd:
         while ((filter=(MFilter*)Next()))
-            rc = (rc && filter->IsExpressionTrue());
+            rc = (rc && filter->IsConditionTrue());
         break;
 
     case kELOr:
         while ((filter=(MFilter*)Next()))
-            rc = (rc || filter->IsExpressionTrue());
+            rc = (rc || filter->IsConditionTrue());
         break;
     }