ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #239 from Tilka/bitfield 

BitFieldTest: fix warnings
This commit is contained in:
Tony Wasserka 2014-04-19 19:13:24 +02:00
parent 79df318a76 c9405b2030
commit 25a011575d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/UnitTests/Common/BitFieldTest.cpp
View File

@ -106,7 +106,7 @@ TEST(BitField, Assignment)
EXPECT_EQ(val, object.full_u64); EXPECT_EQ(val, object.full_u64);
object.full_s64 = (s64)val; object.full_s64 = (s64)val;
EXPECT_EQ((s64)val, object.full_u64); EXPECT_EQ(val, object.full_u64);
object.regular_field_unsigned = val; object.regular_field_unsigned = val;
EXPECT_EQ(val & 0x7, object.regular_field_unsigned); EXPECT_EQ(val & 0x7, object.regular_field_unsigned);
@ -121,8 +121,8 @@ TEST(BitField, Assignment)
EXPECT_EQ(((s64)(object.hex << 61)) >> 61, object.regular_field_signed); EXPECT_EQ(((s64)(object.hex << 61)) >> 61, object.regular_field_signed);
// Assignment from other BitField // Assignment from other BitField
object.at_dword_boundary = object.regular_field_unsigned; object.at_dword_boundary = object.regular_field_signed;
EXPECT_EQ(object.regular_field_unsigned, object.at_dword_boundary); EXPECT_EQ(object.regular_field_signed, object.at_dword_boundary);
} }
} }
@ -148,7 +148,7 @@ TEST(BitField, Alignment)
EXPECT_EQ(val, object.full_u64); EXPECT_EQ(val, object.full_u64);
object.full_s64 = (s64)val; object.full_s64 = (s64)val;
EXPECT_EQ((s64)val, object.full_u64); EXPECT_EQ(val, object.full_u64);
object.regular_field_unsigned = val; object.regular_field_unsigned = val;
EXPECT_EQ(val & 0x7, object.regular_field_unsigned); EXPECT_EQ(val & 0x7, object.regular_field_unsigned);
@ -163,7 +163,7 @@ TEST(BitField, Alignment)
EXPECT_EQ(((s64)(object.hex << 61)) >> 61, object.regular_field_signed); EXPECT_EQ(((s64)(object.hex << 61)) >> 61, object.regular_field_signed);
// Assignment from other BitField // Assignment from other BitField
object.at_dword_boundary = object.regular_field_unsigned; object.at_dword_boundary = object.regular_field_signed;
EXPECT_EQ(object.regular_field_unsigned, object.at_dword_boundary); EXPECT_EQ(object.regular_field_signed, object.at_dword_boundary);
} }
} }