Merge pull request #538 from heylouiz/gtest_1_8_0_gcc_5_4_1

Fix compilation with Gtest 1.8.0 and GCC 5.4.1

Author: redboltz

test/carray.cpp

@@ -113,7 +113,7 @@ TEST(carray, pack_unpack_char_as_str)
     msgpack::pack(ss, v1);
     msgpack::object_handle oh = msgpack::unpack(ss.str().data(), ss.str().size());
     EXPECT_EQ(oh.get().type, msgpack::type::STR);
-    EXPECT_EQ(oh.get().via.str.size, 1);
+    EXPECT_EQ(oh.get().via.str.size, static_cast<size_t>(1));
 
     char v2[2] = { 2, 3 };
     oh.get().convert(v2);
@@ -143,7 +143,7 @@ TEST(carray, obj_with_zone_char_as_str)
 
     msgpack::object o(v1, z);
     EXPECT_EQ(o.type, msgpack::type::STR);
-    EXPECT_EQ(o.via.str.size, 1);
+    EXPECT_EQ(o.via.str.size, static_cast<size_t>(1));
 
     char v2[2];
     o.convert(v2);
@@ -175,7 +175,7 @@ TEST(carray, pack_unpack_unsigned_char_as_bin)
     msgpack::pack(ss, v1);
     msgpack::object_handle oh = msgpack::unpack(ss.str().data(), ss.str().size());
     EXPECT_EQ(oh.get().type, msgpack::type::BIN);
-    EXPECT_EQ(oh.get().via.bin.size, 2);
+    EXPECT_EQ(oh.get().via.bin.size, static_cast<size_t>(2));
 
     unsigned char v2[2];
     oh.get().convert(v2);
@@ -205,7 +205,7 @@ TEST(carray, obj_with_zone_unsigned_char_as_bin)
 
     msgpack::object o(v1, z);
     EXPECT_EQ(o.type, msgpack::type::BIN);
-    EXPECT_EQ(o.via.bin.size, 2);
+    EXPECT_EQ(o.via.bin.size, static_cast<size_t>(2));
 
     unsigned char v2[2];
     o.convert(v2);

test/iterator_cpp11.cpp

@@ -32,7 +32,7 @@ TEST(iterator, vector)
     auto const& msgarr = oh.get().via.array;
     auto dist = std::distance(begin(msgarr), end(msgarr));
     auto vecSize = vec.size();
-    EXPECT_EQ(dist, vecSize);
+    EXPECT_EQ(static_cast<size_t>(dist), vecSize);
 
     vec_type::const_iterator correct = std::begin(vec);
     for (auto const& obj : msgarr) {
@@ -58,7 +58,7 @@ TEST(iterator, map)
     auto const& msgmap = oh.get().via.map;
     auto dist = std::distance(begin(msgmap), end(msgmap));
     auto mapSize = map.size();
-    EXPECT_EQ(dist, mapSize);
+    EXPECT_EQ(static_cast<size_t>(dist), mapSize);
 
     for (auto const& kv : msgmap) {
         auto key = kv.key.as<unsigned int>();

test/msgpack_c.cpp

@@ -368,7 +368,7 @@ TEST(MSGPACKC, simple_buffer_false)
         msgpack_unpack(sbuf.data, sbuf.size, NULL, &z, &obj);
     EXPECT_EQ(MSGPACK_UNPACK_SUCCESS, ret);
     EXPECT_EQ(MSGPACK_OBJECT_BOOLEAN, obj.type);
-    EXPECT_EQ(false, obj.via.boolean);
+    EXPECT_FALSE(obj.via.boolean);
     msgpack_zone_destroy(&z);
     msgpack_sbuffer_destroy(&sbuf);
 }
@@ -663,7 +663,7 @@ TEST(MSGPACKC, simple_buffer_array)
             break;
         case 2:
             EXPECT_EQ(MSGPACK_OBJECT_BOOLEAN, o.type);
-            EXPECT_EQ(false, o.via.boolean);
+            EXPECT_FALSE(o.via.boolean);
             break;
         case 3:
             EXPECT_EQ(MSGPACK_OBJECT_POSITIVE_INTEGER, o.type);
@@ -711,7 +711,7 @@ TEST(MSGPACKC, simple_buffer_map)
             EXPECT_EQ(MSGPACK_OBJECT_BOOLEAN, key.type);
             EXPECT_EQ(true, key.via.boolean);
             EXPECT_EQ(MSGPACK_OBJECT_BOOLEAN, val.type);
-            EXPECT_EQ(false, val.via.boolean);
+            EXPECT_FALSE(val.via.boolean);
             break;
         case 1:
             EXPECT_EQ(MSGPACK_OBJECT_POSITIVE_INTEGER, key.type);

test/msgpack_tuple.cpp

@@ -12,7 +12,7 @@ TEST(msgpack_tuple, member_get)
     t1.get<1>() = false;
     t1.get<2>() = "DEFG";
     EXPECT_EQ(40, t1.get<0>());
-    EXPECT_EQ(false, t1.get<1>());
+    EXPECT_FALSE(t1.get<1>());
     EXPECT_EQ("DEFG", t1.get<2>());
 }
 
@@ -26,7 +26,7 @@ TEST(msgpack_tuple, non_member_get)
     msgpack::type::get<1>(t1) = false;
     msgpack::type::get<2>(t1) = "DEFG";
     EXPECT_EQ(40, msgpack::type::get<0>(t1));
-    EXPECT_EQ(false, msgpack::type::get<1>(t1));
+    EXPECT_FALSE(msgpack::type::get<1>(t1));
     EXPECT_EQ("DEFG", msgpack::type::get<2>(t1));
 }
 
@@ -41,7 +41,7 @@ TEST(msgpack_tuple, std_non_member_get)
     std::get<1>(t1) = false;
     std::get<2>(t1) = "DEFG";
     EXPECT_EQ(40, std::get<0>(t1));
-    EXPECT_EQ(false, std::get<1>(t1));
+    EXPECT_FALSE(std::get<1>(t1));
     EXPECT_EQ("DEFG", std::get<2>(t1));
 }
 
@@ -55,7 +55,7 @@ TEST(msgpack_tuple, make_tuple)
     t1.get<1>() = false;
     t1.get<2>() = "DEFG";
     EXPECT_EQ(40, t1.get<0>());
-    EXPECT_EQ(false, t1.get<1>());
+    EXPECT_FALSE(t1.get<1>());
     EXPECT_EQ("DEFG", t1.get<2>());
 }
 
@@ -97,7 +97,7 @@ TEST(msgpack_tuple, swap)
     EXPECT_EQ(true, t2.get<1>());
     EXPECT_EQ("ABC", t2.get<2>());
     EXPECT_EQ(40, t1.get<0>());
-    EXPECT_EQ(false, t1.get<1>());
+    EXPECT_FALSE(t1.get<1>());
     EXPECT_EQ("DEFG", t1.get<2>());
 }
 #endif

test/object.cpp

@@ -431,7 +431,7 @@ TEST(object, pack_float)
     msgpack::pack(ss1, obj);
     std::stringstream ss2;
     msgpack::pack(ss2, 1.2F);
-    EXPECT_EQ(5, ss1.str().size());
+    EXPECT_EQ(static_cast<size_t>(5), ss1.str().size());
     EXPECT_EQ(ss1.str(), ss2.str());
 }
 
@@ -442,6 +442,6 @@ TEST(object, pack_double)
     msgpack::pack(ss1, obj);
     std::stringstream ss2;
     msgpack::pack(ss2, 1.2);
-    EXPECT_EQ(9, ss1.str().size());
+    EXPECT_EQ(static_cast<size_t>(9), ss1.str().size());
     EXPECT_EQ(ss1.str(), ss2.str());
 }

test/pack_unpack.cpp

@@ -79,7 +79,7 @@ TEST(unpack, int_ret_no_offset_ref)
 
     msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size(), referenced);
     EXPECT_EQ(1, oh.get().as<int>());
-    EXPECT_EQ(false, referenced);
+    EXPECT_FALSE(referenced);
 }
 
 TEST(unpack, int_ret_offset_ref)
@@ -91,7 +91,7 @@ TEST(unpack, int_ret_offset_ref)
 
     msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size(), off, referenced);
     EXPECT_EQ(1, oh.get().as<int>());
-    EXPECT_EQ(false, referenced);
+    EXPECT_FALSE(referenced);
     EXPECT_EQ(off, sbuf.size());
 }
 
@@ -128,7 +128,7 @@ TEST(unpack, int_no_offset_ref)
 
     msgpack::unpack(oh, sbuf.data(), sbuf.size(), referenced);
     EXPECT_EQ(1, oh.get().as<int>());
-    EXPECT_EQ(false, referenced);
+    EXPECT_FALSE(referenced);
 }
 
 TEST(unpack, int_offset_ref)
@@ -141,7 +141,7 @@ TEST(unpack, int_offset_ref)
 
     msgpack::unpack(oh, sbuf.data(), sbuf.size(), off, referenced);
     EXPECT_EQ(1, oh.get().as<int>());
-    EXPECT_EQ(false, referenced);
+    EXPECT_FALSE(referenced);
     EXPECT_EQ(off, sbuf.size());
 }
 
@@ -185,7 +185,7 @@ TEST(unpack, int_pointer_no_off_ref)
     // obsolete
     msgpack::unpack(&oh, sbuf.data(), sbuf.size(), MSGPACK_NULLPTR, &referenced);
     EXPECT_EQ(1, oh.get().as<int>());
-    EXPECT_EQ(false, referenced);
+    EXPECT_FALSE(referenced);
 }
 
 TEST(unpack, int_pointer_off_ref)
@@ -200,7 +200,7 @@ TEST(unpack, int_pointer_off_ref)
     msgpack::unpack(&oh, sbuf.data(), sbuf.size(), &off, &referenced);
     EXPECT_EQ(1, oh.get().as<int>());
     EXPECT_EQ(off, sbuf.size());
-    EXPECT_EQ(false, referenced);
+    EXPECT_FALSE(referenced);
 }
 
 
@@ -249,7 +249,7 @@ TEST(unpack, int_zone_no_offset_ref)
     msgpack::zone z;
     msgpack::object obj = msgpack::unpack(z, sbuf.data(), sbuf.size(), referenced);
     EXPECT_EQ(1, obj.as<int>());
-    EXPECT_EQ(false, referenced);
+    EXPECT_FALSE(referenced);
 }
 
 TEST(unpack, int_zone_offset_ref)
@@ -262,7 +262,7 @@ TEST(unpack, int_zone_offset_ref)
     msgpack::zone z;
     msgpack::object obj = msgpack::unpack(z, sbuf.data(), sbuf.size(), off, referenced);
     EXPECT_EQ(1, obj.as<int>());
-    EXPECT_EQ(false, referenced);
+    EXPECT_FALSE(referenced);
     EXPECT_EQ(off, sbuf.size());
 }