From 4690a678c1a29e71504dcd48eecbffd9edf9d368 Mon Sep 17 00:00:00 2001
From: Nipunn Koorapati <nkoorapa@andrew.cmu.edu>
Date: Wed, 28 Mar 2012 02:40:06 -0400
Subject: [PATCH] Added parentheses around a || b && c statement in
 TypeCastExpr to placate the compiler warning and make the code easier to
 understand.

---
 expr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/expr.cpp b/expr.cpp
index 907f1a84..78a89b6a 100644
--- a/expr.cpp
+++ b/expr.cpp
@@ -6614,7 +6614,7 @@ TypeCastExpr::TypeCheck() {
         return this;
 
     if (Type::Equal(fromType, AtomicType::Void) ||
-        fromType->IsVaryingType() && toType->IsUniformType()) {
+        (fromType->IsVaryingType() && toType->IsUniformType())) {
         Error(pos, "Can't type cast from type \"%s\" to type \"%s\"",
               fromType->GetString().c_str(), toType->GetString().c_str());
         return NULL;