aboutsummaryrefslogtreecommitdiff
path: root/src/common/mac/macho_reader_unittest.cc
diff options
context:
space:
mode:
authordmaclach <dmaclach@4c0a9323-5329-0410-9bdc-e9ce6186880e>2010-07-19 20:43:49 +0000
committerdmaclach <dmaclach@4c0a9323-5329-0410-9bdc-e9ce6186880e>2010-07-19 20:43:49 +0000
commit4ac61acb3a7dad6ce722fe07564be8ec92713228 (patch)
treefb71c49eb2aa7ca1f1867854ad9871c84504bc46 /src/common/mac/macho_reader_unittest.cc
parentBreakpad Linux/Mac symbol dumper: Share duplicate strings that arise in DWARF... (diff)
downloadbreakpad-4ac61acb3a7dad6ce722fe07564be8ec92713228.tar.xz
Clean up build for 64 bit.
Fix up some broken mac projects. Consolidate project settings in xcconfig files. http://breakpad.appspot.com/130001 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@627 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/common/mac/macho_reader_unittest.cc')
-rw-r--r--src/common/mac/macho_reader_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/mac/macho_reader_unittest.cc b/src/common/mac/macho_reader_unittest.cc
index 4e478d79..9bc6d25a 100644
--- a/src/common/mac/macho_reader_unittest.cc
+++ b/src/common/mac/macho_reader_unittest.cc
@@ -992,7 +992,7 @@ TEST_F(LoadCommand, None) {
EXPECT_FALSE(reader.big_endian());
EXPECT_EQ(CPU_TYPE_X86, reader.cpu_type());
EXPECT_EQ(CPU_SUBTYPE_I386_ALL, reader.cpu_subtype());
- EXPECT_EQ(MH_EXECUTE, reader.file_type());
+ EXPECT_EQ(static_cast<uint32_t>(MH_EXECUTE), reader.file_type());
EXPECT_EQ(FileFlags(MH_TWOLEVEL |
MH_DYLDLINK |
MH_NOUNDEFS),
@@ -1018,7 +1018,7 @@ TEST_F(LoadCommand, Unknown) {
EXPECT_TRUE(reader.big_endian());
EXPECT_EQ(CPU_TYPE_X86, reader.cpu_type());
EXPECT_EQ(CPU_SUBTYPE_I386_ALL, reader.cpu_subtype());
- EXPECT_EQ(MH_EXECUTE, reader.file_type());
+ EXPECT_EQ(static_cast<uint32_t>(MH_EXECUTE), reader.file_type());
EXPECT_EQ(FileFlags(MH_TWOLEVEL |
MH_DYLDLINK |
MH_NOUNDEFS),