convert simple bitwise operation to short circuit or (required by Qt5.6)

721aafae · AlmAck · e78c53c2 · 721aafae
Commit 721aafae authored Mar 13, 2016 by AlmAck
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

lib/tests/akabeiversiontest.cpp lib/tests/akabeiversiontest.cpp +3 -3

No files found.
--- a/lib/tests/akabeiversiontest.cpp
+++ b/lib/tests/akabeiversiontest.cpp
@@ -62,13 +62,13 @@ void AkabeiVersionTest::test()
    Akabei::Package::Version v1(version1.toUtf8(), epoch1);
    Akabei::Package::Version v2(version2.toUtf8(), epoch2);
    
-    bool isDifferent = isMinor | isMajor;
+    bool isDifferent = isMinor || isMajor;
    bool isEqual = !isDifferent;
    
    QCOMPARE(v1 < v2, isMinor);
-    QCOMPARE(v1 <= v2, isMinor | isEqual);
+    QCOMPARE(v1 <= v2, isMinor || isEqual);
    QCOMPARE(v1 > v2, isMajor);
-    QCOMPARE(v1 >= v2, isMajor | isEqual);
+    QCOMPARE(v1 >= v2, isMajor || isEqual);
    QCOMPARE(v1 == v2, isEqual);
    QCOMPARE(v1 != v2, isDifferent);
 }