Fix invalid compare operation asserts.

TRAC #15551 Issue=116 Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@559 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fix invalid compare operation asserts.
b31f35ab · daniel@transgaming.com · 721b7f26 · b31f35ab
Commit b31f35ab authored Feb 11, 2011 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 20 deletions

ConstantUnion.h src/compiler/ConstantUnion.h +6 -20

No files found.
--- a/src/compiler/ConstantUnion.h
+++ b/src/compiler/ConstantUnion.h
@@ -99,18 +99,11 @@ public:
        assert(type == constant.type);
        switch (type) {
        case EbtInt:
-            if (iConst > constant.iConst)
-                return true;
-
-            return false;
+            return iConst > constant.iConst;
        case EbtFloat:
-            if (fConst > constant.fConst)
-                return true;
-
-            return false;
+            return fConst > constant.fConst;
        default:
-            assert(false && "Default missing");
-            return false;
+            return false;   // Invalid operation, handled at semantic analysis
        }

        return false;
@@ -121,18 +114,11 @@ public:
        assert(type == constant.type);
        switch (type) {
        case EbtInt:
-            if (iConst < constant.iConst)
-                return true;
-
-            return false;
+            return iConst < constant.iConst;
        case EbtFloat:
-            if (fConst < constant.fConst)
-                return true;
-
-            return false;
+            return fConst < constant.fConst;
        default:
-            assert(false && "Default missing");
-            return false;
+            return false;   // Invalid operation, handled at semantic analysis
        }

        return false;