From 0e45a1268a7f8ffad1b67ad67a4759b0079589a0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 6 Feb 2017 22:34:52 -0500 Subject: macho_reader_unittest: use EXPECT_FALSE This avoids compile time errors: In file included from ./src/testing/googletest/include/gtest/gtest.h:1874:0, from ./src/breakpad_googletest_includes.h:33, from src/common/mac/macho_reader_unittest.cc:39: src/common/mac/macho_reader_unittest.cc: In member function 'virtual void LoadCommand_SegmentBE32_Test::TestBody()': ./src/testing/googletest/include/gtest/internal/gtest-internal.h:133:55: error: converting 'false' to pointer type for argument 1 of 'char testing::internal::IsNullLiteralHelper(testing::internal::Secret*)' [-Werror=conversion-null] (sizeof(::testing::internal::IsNullLiteralHelper(x)) == 1) ^ ... src/common/mac/macho_reader_unittest.cc:1117:3: note: in expansion of macro 'EXPECT_EQ' EXPECT_EQ(false, actual_segment.bits_64); Change-Id: I0cf88160dbe17b0feebed3c91ad65491b81023fd Reviewed-on: https://chromium-review.googlesource.com/439004 Reviewed-by: Mark Mentovai --- src/common/mac/macho_reader_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/mac/macho_reader_unittest.cc b/src/common/mac/macho_reader_unittest.cc index 8ceab14b..d8459d8c 100644 --- a/src/common/mac/macho_reader_unittest.cc +++ b/src/common/mac/macho_reader_unittest.cc @@ -1114,7 +1114,7 @@ TEST_F(LoadCommand, SegmentBE32) { Return(true))); EXPECT_TRUE(reader.WalkLoadCommands(&load_command_handler)); - EXPECT_EQ(false, actual_segment.bits_64); + EXPECT_FALSE(actual_segment.bits_64); EXPECT_EQ("froon", actual_segment.name); EXPECT_EQ(0x1891139cU, actual_segment.vmaddr); EXPECT_EQ(0xcb76584fU, actual_segment.vmsize); @@ -1151,7 +1151,7 @@ TEST_F(LoadCommand, SegmentLE32) { Return(true))); EXPECT_TRUE(reader.WalkLoadCommands(&load_command_handler)); - EXPECT_EQ(false, actual_segment.bits_64); + EXPECT_FALSE(actual_segment.bits_64); EXPECT_EQ("sixteenprecisely", actual_segment.name); EXPECT_EQ(0x4b877866U, actual_segment.vmaddr); EXPECT_EQ(0xcb76584fU, actual_segment.vmsize); -- cgit v1.2.1