From 55b6b6434e0c6772d68578534983f50fd9214909 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 5 Dec 2012 16:24:48 +0000 Subject: [PATCH] Remove bad and useless enum to bool conversion. llvm-svn: 169390 --- clang/lib/Format/Format.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index 030e35e..6494c3d 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/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) { -- 2.7.4