Impala Public Jenkins has submitted this change and it was merged. ( http://gerrit.cloudera.org:8080/15964 )
Change subject: IMPALA-9761: Fix GCC7 ambiguous else warning for gtest macros ...................................................................... IMPALA-9761: Fix GCC7 ambiguous else warning for gtest macros On GCC7, a dangling-else warning is firing for code like: if (cond1) ASSERT_TRUE(cond2) This is true for several ASSERT_* and EXPECT_* gtest macros. gtest had some code to avoid warnings for code of this form, but that code is no longer effective. gtest now disables the dangling-else warning. Since this is just a matter of adding braces, this adds braces for all those locations. For consistency, this may include locations that were not failing. I found locations by doing: git grep EXPECT_ | grep if git grep ASSERT_ | grep if and manually looking through the output. Testing: - Builds successfully Change-Id: Ieb664afe83736a71508302575e8e66a1b506c985 Reviewed-on: http://gerrit.cloudera.org:8080/15964 Reviewed-by: Impala Public Jenkins <[email protected]> Tested-by: Impala Public Jenkins <[email protected]> --- M be/src/exec/parquet/parquet-common-test.cc M be/src/runtime/buffered-tuple-stream-test.cc M be/src/runtime/bufferpool/buffer-pool-test.cc M be/src/runtime/io/disk-io-mgr-test.cc M be/src/runtime/timestamp-test.cc M be/src/testutil/cpu-util.h 6 files changed, 29 insertions(+), 11 deletions(-) Approvals: Impala Public Jenkins: Looks good to me, approved; Verified -- To view, visit http://gerrit.cloudera.org:8080/15964 To unsubscribe, visit http://gerrit.cloudera.org:8080/settings Gerrit-Project: Impala-ASF Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ieb664afe83736a71508302575e8e66a1b506c985 Gerrit-Change-Number: 15964 Gerrit-PatchSet: 3 Gerrit-Owner: Joe McDonnell <[email protected]> Gerrit-Reviewer: Impala Public Jenkins <[email protected]> Gerrit-Reviewer: Jim Apple <[email protected]> Gerrit-Reviewer: Joe McDonnell <[email protected]>
