[NFC] Fix GCC warning on enum/non-enum ternary thanks to 438863a

On the above patch (438863a#commitcomment-161519239)

it was brought up that the commit 'caused' a GCC warning.  The Hueristic
for the GCC warning is a little strange, but the fix is easy enough, so
this patch should fix it by making sure both sides of the ternary are
the same type.

Author: erichkeane

clang/include/clang/Sema/Scope.h

@@ -298,7 +298,7 @@ class Scope {
   // is disallowed despite being a continue scope.
   void setIsConditionVarScope(bool InConditionVarScope) {
     Flags = (Flags & ~ConditionVarScope) |
-            (InConditionVarScope ? ConditionVarScope : 0);
+            (InConditionVarScope ? ConditionVarScope : NoScope);
   }
 
   bool isConditionVarScope() const {