r218597 - clang-format: Fix GCC warning about implicit bool pointer conversion.
Daniel Jasper
djasper at google.com
Mon Sep 29 01:07:47 PDT 2014
Author: djasper
Date: Mon Sep 29 03:07:46 2014
New Revision: 218597
URL: http://llvm.org/viewvc/llvm-project?rev=218597&view=rev
Log:
clang-format: Fix GCC warning about implicit bool pointer conversion.
Introduced in r217880.
Modified:
cfe/trunk/unittests/Format/FormatTest.cpp
Modified: cfe/trunk/unittests/Format/FormatTest.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=218597&r1=218596&r2=218597&view=diff
==============================================================================
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)
+++ cfe/trunk/unittests/Format/FormatTest.cpp Mon Sep 29 03:07:46 2014
@@ -8353,13 +8353,15 @@ TEST_F(FormatTest, GetsCorrectBasedOnSty
EXPECT_ALL_STYLES_EQUAL(Styles);
}
-#define CHECK_PARSE_BOOL(FIELD) \
+#define CHECK_PARSE_BOOL_FIELD(FIELD, CONFIG_NAME) \
Style.FIELD = false; \
- EXPECT_EQ(0, parseConfiguration(#FIELD ": true", &Style).value()); \
+ EXPECT_EQ(0, parseConfiguration(CONFIG_NAME ": true", &Style).value()); \
EXPECT_TRUE(Style.FIELD); \
- EXPECT_EQ(0, parseConfiguration(#FIELD ": false", &Style).value()); \
+ EXPECT_EQ(0, parseConfiguration(CONFIG_NAME ": false", &Style).value()); \
EXPECT_FALSE(Style.FIELD);
+#define CHECK_PARSE_BOOL(FIELD) CHECK_PARSE_BOOL_FIELD(FIELD, #FIELD)
+
#define CHECK_PARSE(TEXT, FIELD, VALUE) \
EXPECT_NE(VALUE, Style.FIELD); \
EXPECT_EQ(0, parseConfiguration(TEXT, &Style).value()); \
@@ -8382,9 +8384,7 @@ TEST_F(FormatTest, ParsesConfigurationBo
CHECK_PARSE_BOOL(BreakConstructorInitializersBeforeComma);
CHECK_PARSE_BOOL(ConstructorInitializerAllOnOneLineOrOnePerLine);
CHECK_PARSE_BOOL(DerivePointerAlignment);
- // For backward compatibility:
- CHECK_PARSE("DerivePointerBinding: true", DerivePointerAlignment, true);
- CHECK_PARSE("DerivePointerBinding: false", DerivePointerAlignment, false);
+ CHECK_PARSE_BOOL_FIELD(DerivePointerAlignment, "DerivePointerBinding");
CHECK_PARSE_BOOL(IndentCaseLabels);
CHECK_PARSE_BOOL(IndentWrappedFunctionNames);
CHECK_PARSE_BOOL(KeepEmptyLinesAtTheStartOfBlocks);
More information about the cfe-commits
mailing list