From d89d586ec1873e14b448bff806c3ebfcd25c3bb8 Mon Sep 17 00:00:00 2001 From: Walter Gray Date: Fri, 9 Jun 2017 13:29:28 -0700 Subject: [PATCH 1/2] workaround alignment issues with gtest --- src/autowiring/test/AutoConfigTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/autowiring/test/AutoConfigTest.cpp b/src/autowiring/test/AutoConfigTest.cpp index 955bbcf52..170fe0d6e 100644 --- a/src/autowiring/test/AutoConfigTest.cpp +++ b/src/autowiring/test/AutoConfigTest.cpp @@ -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, (uint64_t)c.bUnsigned); } TEST_F(AutoConfigTest, String) { @@ -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((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"; } From 41fddaf064d47db525e2499f57fc499fce5ab233 Mon Sep 17 00:00:00 2001 From: Walter Gray Date: Fri, 9 Jun 2017 16:02:49 -0700 Subject: [PATCH 2/2] use static_cast --- src/autowiring/test/AutoConfigTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/autowiring/test/AutoConfigTest.cpp b/src/autowiring/test/AutoConfigTest.cpp index 170fe0d6e..9b103aeb0 100644 --- a/src/autowiring/test/AutoConfigTest.cpp +++ b/src/autowiring/test/AutoConfigTest.cpp @@ -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, (uint64_t)c.bUnsigned); + ASSERT_EQ(92999, static_cast(c.bUnsigned)); } TEST_F(AutoConfigTest, String) { @@ -139,7 +139,7 @@ TEST_F(AutoConfigTest, IntegerUnsigned) { ASSERT_STREQ("10929", strVal.c_str()); autowiring::ConfigSet("bUnsigned", c, "999"); - ASSERT_EQ((uint64_t)c.bUnsigned, 999) << "Integer configuration value not assigned"; + ASSERT_EQ(static_cast(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"; }