Skip to content

Commit

Permalink
Merge pull request #1019 from leapmotion/fix-vs2017-32
Browse files Browse the repository at this point in the history
Fix Visual Studio 2017 32 bit builds
  • Loading branch information
jdonald committed Jun 9, 2017
2 parents 7742d95 + 41fddaf commit b6eaa59
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/autowiring/test/AutoConfigTest.cpp
Expand Up @@ -109,7 +109,7 @@ TEST_F(AutoConfigTest, ConfigDefault) {
// because MyConfigurableClass is not actually in a context, which means Autowiring will not
// attempt to configure it.
MyConfigurableClass c;
ASSERT_EQ(92999, c.bUnsigned);
ASSERT_EQ(92999, static_cast<uint64_t>(c.bUnsigned));
}

TEST_F(AutoConfigTest, String) {
Expand Down Expand Up @@ -139,7 +139,7 @@ TEST_F(AutoConfigTest, IntegerUnsigned) {
ASSERT_STREQ("10929", strVal.c_str());

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

Expand Down

0 comments on commit b6eaa59

Please sign in to comment.