Skip to content

Commit b6eaa59

Browse files
authored
Merge pull request #1019 from leapmotion/fix-vs2017-32
Fix Visual Studio 2017 32 bit builds
2 parents 7742d95 + 41fddaf commit b6eaa59

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/autowiring/test/AutoConfigTest.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ TEST_F(AutoConfigTest, ConfigDefault) {
109109
// because MyConfigurableClass is not actually in a context, which means Autowiring will not
110110
// attempt to configure it.
111111
MyConfigurableClass c;
112-
ASSERT_EQ(92999, c.bUnsigned);
112+
ASSERT_EQ(92999, static_cast<uint64_t>(c.bUnsigned));
113113
}
114114

115115
TEST_F(AutoConfigTest, String) {
@@ -139,7 +139,7 @@ TEST_F(AutoConfigTest, IntegerUnsigned) {
139139
ASSERT_STREQ("10929", strVal.c_str());
140140

141141
autowiring::ConfigSet("bUnsigned", c, "999");
142-
ASSERT_EQ(c.bUnsigned, 999) << "Integer configuration value not assigned";
142+
ASSERT_EQ(static_cast<uint64_t>(c.bUnsigned), 999) << "Integer configuration value not assigned";
143143
ASSERT_ANY_THROW(autowiring::ConfigSet("bUnsigned", c, "-999")) << "Incorrectly assigned as signed value to an unsigned field";
144144
}
145145

0 commit comments

Comments
 (0)