Remove bad and useless enum to bool conversion.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@169390 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 030e35e38db2a4a27136d993cc4be8acf568a14a..6494c3d3898df22d90371935f72727d57a34748e 100644 (file)
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -509,11 +509,8 @@ public:
           canBreakBetween(Line.Tokens[i - 1], Line.Tokens[i]);
 
       if (Line.Tokens[i].Tok.is(tok::colon)) {
-        if (Line.Tokens[0].Tok.is(tok::kw_case) || i == e - 1) {
-          Annotation.SpaceRequiredBefore = false;
-        } else {
-          Annotation.SpaceRequiredBefore = TokenAnnotation::TT_ConditionalExpr;
-        }
+        Annotation.SpaceRequiredBefore =
+            Line.Tokens[0].Tok.isNot(tok::kw_case) && i != e - 1;
       } else if (Annotations[i - 1].Type == TokenAnnotation::TT_UnaryOperator) {
         Annotation.SpaceRequiredBefore = false;
       } else if (Annotation.Type == TokenAnnotation::TT_UnaryOperator) {