diff options
| -rw-r--r-- | src/xmlpatterns/type/qatomiccomparatorlocators.cpp | 10 | ||||
| -rw-r--r-- | src/xmlpatterns/type/qatomicmathematicianlocators.cpp | 15 |
2 files changed, 15 insertions, 10 deletions
diff --git a/src/xmlpatterns/type/qatomiccomparatorlocators.cpp b/src/xmlpatterns/type/qatomiccomparatorlocators.cpp index 870fc8a..c09652a 100644 --- a/src/xmlpatterns/type/qatomiccomparatorlocators.cpp +++ b/src/xmlpatterns/type/qatomiccomparatorlocators.cpp @@ -54,11 +54,12 @@ static const AtomicComparator::Operators AllCompOperators(AtomicComparator::Oper #define addVisitor(owner, type, comp, validOps) \ AtomicTypeVisitorResult::Ptr \ owner##ComparatorLocator::visit(const type *, \ - const qint16 op, \ + const qint16 opIn, \ const SourceLocationReflection *const) const \ { \ /* Note the extra paranteses around validOps. */ \ - if(((validOps) & AtomicComparator::Operator(op)) == op) \ + const AtomicComparator::Operator op = AtomicComparator::Operator(opIn); \ + if (((validOps) & op) == op) \ return AtomicTypeVisitorResult::Ptr(new comp()); \ else \ return AtomicTypeVisitorResult::Ptr(); \ @@ -67,12 +68,13 @@ owner##ComparatorLocator::visit(const type *, #define visitorForDouble(owner, type) \ AtomicTypeVisitorResult::Ptr \ owner##ComparatorLocator::visit(const type *, \ - const qint16 op, \ + const qint16 opIn, \ const SourceLocationReflection *const) const \ { \ + const AtomicComparator::Operator op = AtomicComparator::Operator(opIn); \ if(((AtomicComparator::OperatorNotEqual | \ AtomicComparator::OperatorGreaterOrEqual | \ - AtomicComparator::OperatorLessOrEqual) & AtomicComparator::Operator(op)) == op) \ + AtomicComparator::OperatorLessOrEqual) & op) == op) \ return AtomicTypeVisitorResult::Ptr(new AbstractFloatComparator()); \ else if(op == AtomicComparator::OperatorLessThanNaNLeast) \ return AtomicTypeVisitorResult::Ptr(new AbstractFloatSortComparator<AtomicComparator::OperatorLessThanNaNLeast>()); \ diff --git a/src/xmlpatterns/type/qatomicmathematicianlocators.cpp b/src/xmlpatterns/type/qatomicmathematicianlocators.cpp index 59446f9..9177b33 100644 --- a/src/xmlpatterns/type/qatomicmathematicianlocators.cpp +++ b/src/xmlpatterns/type/qatomicmathematicianlocators.cpp @@ -47,12 +47,13 @@ using namespace QPatternist; #define implMathVisit(ownerClass, visitor, mather, validOps) \ AtomicTypeVisitorResult::Ptr \ -ownerClass##MathematicianLocator::visit(const visitor *, const qint16 op, \ +ownerClass##MathematicianLocator::visit(const visitor *, const qint16 opIn, \ const SourceLocationReflection *const r) const \ { \ Q_UNUSED(r) \ /* Note the extra paranteses around validOps. */ \ - if(((validOps) & AtomicMathematician::Operator(op)) == op) \ + const AtomicComparator::Operator op = AtomicComparator::Operator(opIn); \ + if (((validOps) & op) == op) \ return AtomicTypeVisitorResult::Ptr(new mather()); \ else \ return AtomicTypeVisitorResult::Ptr(); \ @@ -60,11 +61,12 @@ ownerClass##MathematicianLocator::visit(const visitor *, const qint16 op, #define implReportingMathVisit(ownerClass, visitor, mather, validOps) \ AtomicTypeVisitorResult::Ptr \ -ownerClass##MathematicianLocator::visit(const visitor *, const qint16 op, \ +ownerClass##MathematicianLocator::visit(const visitor *, const qint16 opIn, \ const SourceLocationReflection *const r) const \ { \ + const AtomicComparator::Operator op = AtomicComparator::Operator(opIn); \ /* Note the extra paranteses around validOps. */ \ - if(((validOps) & AtomicMathematician::Operator(op)) == op) \ + if (((validOps) & op) == op) \ return AtomicTypeVisitorResult::Ptr(new mather(r)); \ else \ return AtomicTypeVisitorResult::Ptr(); \ @@ -72,11 +74,12 @@ ownerClass##MathematicianLocator::visit(const visitor *, const qint16 op, #define implRevReportingMathVisit(ownerClass, visitor, mather, validOps) \ AtomicTypeVisitorResult::Ptr \ -ownerClass##MathematicianLocator::visit(const visitor *, const qint16 op, \ +ownerClass##MathematicianLocator::visit(const visitor *, const qint16 opIn, \ const SourceLocationReflection *const r) const \ { \ + const AtomicComparator::Operator op = AtomicComparator::Operator(opIn); \ /* Note the extra paranteses around validOps. */ \ - if(((validOps) & AtomicMathematician::Operator(op)) == op) \ + if (((validOps) & op) == op) \ return AtomicTypeVisitorResult::Ptr(new OperandSwitcherMathematician( \ AtomicMathematician::Ptr(new mather(r)))); \ else \ |