summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-01-16 10:10:03 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-01-16 12:43:10 +0000
commitfabf557bb8390a94ff4b5d8688a91ffe4abd17ec (patch)
tree9363ae96bc164fa9d725afc644f6b4714471f4be
parent9cd01f60c0793b52201d986f0aae5841fd0a7513 (diff)
downloadqtxmlpatterns-fabf557bb8390a94ff4b5d8688a91ffe4abd17ec.tar.gz
qatomiccomparatorlocators.cpp: Fix signedness comparison warnings
Fix numerous warnings: qtxmlpatterns/src/xmlpatterns/type/qatomiccomparatorlocators.cpp:61:57: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare] if(((validOps) & AtomicComparator::Operator(op)) == op) Task-number: QTBUG-58173 Change-Id: Ic256d51e9a3306b960afecf8eb7b48e451c89144 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
-rw-r--r--src/xmlpatterns/type/qatomiccomparatorlocators.cpp10
-rw-r--r--src/xmlpatterns/type/qatomicmathematicianlocators.cpp15
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 \