From 39e7856c487f5074f14fd448b76de33756e122ca Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Wed, 11 Nov 2015 23:13:00 +0900 Subject: [PATCH 1/5] Fixed #382. Fixed warnings on gcc 4.1.2. Added gcc version checking for adding -std=c++03 flag. --- CMakeLists.txt | 23 ++++++++++++++++++++--- example/boost/CMakeLists.txt | 14 +++++++++++++- example/c/CMakeLists.txt | 14 +++++++++++++- example/cpp03/CMakeLists.txt | 19 ++++++++++++++++--- example/cpp11/CMakeLists.txt | 14 +++++++++++++- test/CMakeLists.txt | 13 ++++++++++++- test/boost_variant.cpp | 12 ++++++------ test/msgpack_basic.cpp | 6 +++--- test/msgpack_c.cpp | 8 ++++---- test/msgpack_container.cpp | 6 +++--- test/object.cpp | 4 ++-- test/object_with_zone.cpp | 4 ++-- 12 files changed, 107 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f59968e3..c1a572b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,8 @@ SET (prefix ${CMAKE_INSTALL_PREFIX}) SET (exec_prefix "\${prefix}") SET (libdir "\${exec_prefix}/lib") SET (includedir "\${prefix}/include") +SET (GNUCXX_STD_SUPPORT_VERSION "4.3") +SET (GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION "4.4") OPTION (MSGPACK_CXX11 "Using c++11 compiler" OFF) OPTION (MSGPACK_32BIT "32bit compile" OFF) @@ -43,7 +45,10 @@ IF (MSGPACK_CXX11) ENDIF () ELSE () IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - SET (CMAKE_CXX_FLAGS "-std=c++03 ${CMAKE_CXX_FLAGS}") + IF ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER ${GNUCXX_STD_SUPPORT_VERSION}) OR + (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL ${GNUCXX_STD_SUPPORT_VERSION})) + SET (CMAKE_CXX_FLAGS "-std=c++03 ${CMAKE_CXX_FLAGS}") + ENDIF () ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") SET (CMAKE_CXX_FLAGS "-std=c++03 ${CMAKE_CXX_FLAGS}") ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") @@ -278,10 +283,22 @@ ENDIF () IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") IF (MSGPACK_ENABLE_SHARED) - SET_PROPERTY (TARGET msgpack APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Wno-mismatched-tags -Werror -g -O3 -DPIC") + SET_PROPERTY (TARGET msgpack APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 -DPIC") ENDIF () - SET_PROPERTY (TARGET msgpack-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Wno-mismatched-tags -Werror -g -O3" ) + SET_PROPERTY (TARGET msgpack-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3" ) ENDIF () + +IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + SET_PROPERTY (TARGET msgpack APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") +ENDIF () + +IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + IF ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}) OR + (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION})) + SET_PROPERTY (TARGET msgpack APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") + ENDIF () +ENDIF () + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]") STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") diff --git a/example/boost/CMakeLists.txt b/example/boost/CMakeLists.txt index 57a31acc..46eb04bc 100644 --- a/example/boost/CMakeLists.txt +++ b/example/boost/CMakeLists.txt @@ -12,8 +12,20 @@ FOREACH (source_file ${exec_PROGRAMS}) ${source_file} ) IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -Wno-mismatched-tags -g -O3") + SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3") ENDIF () + + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") + ENDIF () + + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + IF ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}) OR + (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION})) + SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") + ENDIF () + ENDIF () + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]") STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") diff --git a/example/c/CMakeLists.txt b/example/c/CMakeLists.txt index ab337dba..31513b01 100644 --- a/example/c/CMakeLists.txt +++ b/example/c/CMakeLists.txt @@ -20,8 +20,20 @@ FOREACH (source_file ${exec_PROGRAMS}) msgpack ) IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -Wno-mismatched-tags -g -O3") + SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3") ENDIF () + + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") + ENDIF () + + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + IF ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}) OR + (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION})) + SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") + ENDIF () + ENDIF () + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]") STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") diff --git a/example/cpp03/CMakeLists.txt b/example/cpp03/CMakeLists.txt index 6c384fa7..1e5c02a2 100644 --- a/example/cpp03/CMakeLists.txt +++ b/example/cpp03/CMakeLists.txt @@ -33,7 +33,7 @@ FOREACH (source_file ${exec_PROGRAMS}) ${source_file} ) IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -Wno-mismatched-tags -g -O3") + SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3") ENDIF () IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]") @@ -54,7 +54,7 @@ FOREACH (source_file ${with_pthread_PROGRAMS}) pthread ) IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -Wno-mismatched-tags -g -O3 -pthread") + SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 -pthread") ENDIF () IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]") @@ -86,9 +86,22 @@ FOREACH (source_file ${with_boost_lib_PROGRAMS}) rt ) ENDIF () + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -Wno-mismatched-tags -g -O3") + SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -O3") ENDIF () + + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") + ENDIF () + + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + IF ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}) OR + (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION})) + SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") + ENDIF () + ENDIF () + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]") STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") diff --git a/example/cpp11/CMakeLists.txt b/example/cpp11/CMakeLists.txt index 25211ea3..4ddd4f62 100644 --- a/example/cpp11/CMakeLists.txt +++ b/example/cpp11/CMakeLists.txt @@ -15,8 +15,20 @@ IF (MSGPACK_CXX11) ${source_file} ) IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -Wno-mismatched-tags -g -O3") + SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 ") ENDIF () + + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") + ENDIF () + + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + IF ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}) OR + (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION})) + SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") + ENDIF () + ENDIF () + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]") STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 6c0f3202..3eca7683 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -75,8 +75,19 @@ FOREACH (source_file ${check_PROGRAMS}) ) ADD_TEST (${source_file_we} ${source_file_we}) IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -Wno-mismatched-tags -g -O3") + SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 ") ENDIF () + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") + ENDIF () + + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + IF ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}) OR + (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION})) + SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") + ENDIF () + ENDIF () + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4] /WX") STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") diff --git a/test/boost_variant.cpp b/test/boost_variant.cpp index abc574ce..f8d2e8b8 100644 --- a/test/boost_variant.cpp +++ b/test/boost_variant.cpp @@ -147,7 +147,7 @@ TEST(MSGPACK_BOOST, pack_convert_variant_positive_integer) std::stringstream ss; msgpack::type::variant val1 = 123; EXPECT_TRUE(val1.is_uint64_t()); - EXPECT_EQ(val1.as_uint64_t(), 123); + EXPECT_EQ(val1.as_uint64_t(), 123U); msgpack::pack(ss, val1); @@ -155,7 +155,7 @@ TEST(MSGPACK_BOOST, pack_convert_variant_positive_integer) msgpack::unpack(ret, ss.str().data(), ss.str().size()); msgpack::type::variant val2 = ret.get().as(); EXPECT_TRUE(val2.is_uint64_t()); - EXPECT_EQ(val2.as_uint64_t(), 123); + EXPECT_EQ(val2.as_uint64_t(), 123U); EXPECT_NO_THROW(boost::get(val2)); EXPECT_TRUE(val1 == val2); } @@ -164,11 +164,11 @@ TEST(MSGPACK_BOOST, object_variant_positive_integer) { msgpack::type::variant val1 = 123; EXPECT_TRUE(val1.is_uint64_t()); - EXPECT_EQ(val1.as_uint64_t(), 123); + EXPECT_EQ(val1.as_uint64_t(), 123U); msgpack::object obj(val1); msgpack::type::variant val2 = obj.as(); EXPECT_TRUE(val2.is_uint64_t()); - EXPECT_EQ(val2.as_uint64_t(), 123); + EXPECT_EQ(val2.as_uint64_t(), 123U); EXPECT_NO_THROW(boost::get(val2)); EXPECT_TRUE(val1 == val2); } @@ -178,11 +178,11 @@ TEST(MSGPACK_BOOST, object_with_zone_variant_positive_integer) msgpack::zone z; msgpack::type::variant val1 = 123; EXPECT_TRUE(val1.is_uint64_t()); - EXPECT_EQ(val1.as_uint64_t(), 123); + EXPECT_EQ(val1.as_uint64_t(), 123U); msgpack::object obj(val1, z); msgpack::type::variant val2 = obj.as(); EXPECT_TRUE(val2.is_uint64_t()); - EXPECT_EQ(val2.as_uint64_t(), 123); + EXPECT_EQ(val2.as_uint64_t(), 123U); EXPECT_NO_THROW(boost::get(val2)); EXPECT_TRUE(val1 == val2); } diff --git a/test/msgpack_basic.cpp b/test/msgpack_basic.cpp index 51bc27d8..15215b2c 100644 --- a/test/msgpack_basic.cpp +++ b/test/msgpack_basic.cpp @@ -408,7 +408,7 @@ TEST(MSGPACK, simple_buffer_fixext_1byte_255) msgpack::sbuffer sbuf; msgpack::packer packer(sbuf); char buf[size]; - for (int i = 0; i != size; ++i) buf[i] = static_cast(i); + for (std::size_t i = 0; i != size; ++i) buf[i] = static_cast(i); packer.pack_ext(sizeof(buf), 77); packer.pack_ext_body(buf, sizeof(buf)); @@ -426,7 +426,7 @@ TEST(MSGPACK, simple_buffer_fixext_2byte_256) msgpack::sbuffer sbuf; msgpack::packer packer(sbuf); char buf[size]; - for (int i = 0; i != size; ++i) buf[i] = static_cast(i); + for (std::size_t i = 0; i != size; ++i) buf[i] = static_cast(i); packer.pack_ext(sizeof(buf), 77); packer.pack_ext_body(buf, sizeof(buf)); @@ -444,7 +444,7 @@ TEST(MSGPACK, simple_buffer_fixext_2byte_65535) msgpack::sbuffer sbuf; msgpack::packer packer(sbuf); char buf[size]; - for (int i = 0; i != size; ++i) buf[i] = static_cast(i); + for (std::size_t i = 0; i != size; ++i) buf[i] = static_cast(i); packer.pack_ext(sizeof(buf), 77); packer.pack_ext_body(buf, sizeof(buf)); diff --git a/test/msgpack_c.cpp b/test/msgpack_c.cpp index 623db8be..3ce5e2bf 100644 --- a/test/msgpack_c.cpp +++ b/test/msgpack_c.cpp @@ -521,7 +521,7 @@ TEST(MSGPACKC, simple_buffer_fixext_1byte_255) { const size_t size = 255; char buf[size]; - for (int i = 0; i != size; ++i) buf[i] = i; + for (size_t i = 0; i != size; ++i) buf[i] = i; msgpack_sbuffer sbuf; msgpack_sbuffer_init(&sbuf); @@ -548,7 +548,7 @@ TEST(MSGPACKC, simple_buffer_fixext_2byte_256) { const size_t size = 256; char buf[size]; - for (int i = 0; i != size; ++i) buf[i] = i; + for (size_t i = 0; i != size; ++i) buf[i] = i; msgpack_sbuffer sbuf; msgpack_sbuffer_init(&sbuf); @@ -575,7 +575,7 @@ TEST(MSGPACKC, simple_buffer_fixext_2byte_65535) { const size_t size = 65535; char buf[size]; - for (int i = 0; i != size; ++i) buf[i] = i; + for (size_t i = 0; i != size; ++i) buf[i] = i; msgpack_sbuffer sbuf; msgpack_sbuffer_init(&sbuf); @@ -602,7 +602,7 @@ TEST(MSGPACKC, simple_buffer_fixext_4byte_65536) { const size_t size = 65536; char buf[size]; - for (int i = 0; i != size; ++i) buf[i] = i; + for (size_t i = 0; i != size; ++i) buf[i] = i; msgpack_sbuffer sbuf; msgpack_sbuffer_init(&sbuf); diff --git a/test/msgpack_container.cpp b/test/msgpack_container.cpp index ef1b85b0..03e8ac92 100644 --- a/test/msgpack_container.cpp +++ b/test/msgpack_container.cpp @@ -146,7 +146,7 @@ TEST(MSGPACK_STL, simple_buffer_assoc_vector) TEST(MSGPACK_STL, simple_buffer_map) { - typedef map, test::allocator > > type; + typedef map, test::allocator > > type; for (unsigned int k = 0; k < kLoop; k++) { type val1; for (unsigned int i = 0; i < kElements; i++) @@ -228,7 +228,7 @@ TEST(MSGPACK_STL, simple_buffer_pair) TEST(MSGPACK_STL, simple_buffer_multimap) { - typedef multimap, test::allocator > > type; + typedef multimap, test::allocator > > type; for (unsigned int k = 0; k < kLoop; k++) { type val1; for (unsigned int i = 0; i < kElements; i++) { @@ -352,7 +352,7 @@ TEST(MSGPACK_TR1, simple_buffer_tr1_unordered_map) TEST(MSGPACK_TR1, simple_buffer_tr1_unordered_multimap) { - typedef tr1::unordered_multimap, test::equal_to, test::allocator > > type; + typedef tr1::unordered_multimap, test::equal_to, test::allocator > > type; for (unsigned int k = 0; k < kLoop; k++) { type val1; for (unsigned int i = 0; i < kElements; i++) { diff --git a/test/object.cpp b/test/object.cpp index 0bbb9c58..4a4074cd 100644 --- a/test/object.cpp +++ b/test/object.cpp @@ -294,7 +294,7 @@ TEST(object, construct_enum) { msgpack::object obj(elem); EXPECT_EQ(msgpack::type::POSITIVE_INTEGER, obj.type); - EXPECT_EQ(elem, obj.via.u64); + EXPECT_EQ(static_cast(elem), obj.via.u64); } #if !defined(MSGPACK_USE_CPP03) @@ -312,7 +312,7 @@ TEST(object, construct_enum_outer) { msgpack::object obj(outer_enum::elem); EXPECT_EQ(msgpack::type::POSITIVE_INTEGER, obj.type); - EXPECT_EQ(elem, obj.via.u64); + EXPECT_EQ(static_cast(elem), obj.via.u64); } #if !defined(MSGPACK_USE_CPP03) diff --git a/test/object_with_zone.cpp b/test/object_with_zone.cpp index 5664c0fd..6b69f20f 100644 --- a/test/object_with_zone.cpp +++ b/test/object_with_zone.cpp @@ -687,7 +687,7 @@ TEST(object_with_zone, construct_enum) msgpack::zone z; msgpack::object obj(elem, z); EXPECT_EQ(msgpack::type::POSITIVE_INTEGER, obj.type); - EXPECT_EQ(elem, obj.via.u64); + EXPECT_EQ(static_cast(elem), obj.via.u64); } #if !defined(MSGPACK_USE_CPP03) @@ -707,7 +707,7 @@ TEST(object_with_zone, construct_enum_outer) msgpack::zone z; msgpack::object obj(outer_enum::elem, z); EXPECT_EQ(msgpack::type::POSITIVE_INTEGER, obj.type); - EXPECT_EQ(elem, obj.via.u64); + EXPECT_EQ(static_cast(elem), obj.via.u64); } // User defined inheriting classes From 50e1c23941f767c9ca2afa1b41a4cd43310fb54c Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Sun, 15 Nov 2015 12:40:17 +0900 Subject: [PATCH 2/5] Removed gcc_atomic.cpp from CMakelist.txt. --- CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c1a572b5..c87032b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,12 +124,6 @@ int main(int argc, char * argv[]) } " MSGPACK_ENABLE_GCC_CXX_ATOMIC) -IF (MSGPACK_ENABLE_GCC_CXX_ATOMIC) - LIST (APPEND msgpack_SOURCES - src/gcc_atomic.cpp - ) -ENDIF () - LIST (APPEND msgpack_SOURCES src/unpack.c From 46502480e9e35ab4c15903a696bdf4b8f8249b1a Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Sun, 15 Nov 2015 12:40:37 +0900 Subject: [PATCH 3/5] Replaced EXPECT_EQ with EXPECT_TRUE to avoid ostream requirement. --- test/array_ref.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/test/array_ref.cpp b/test/array_ref.cpp index 968bb8e6..06ad73da 100644 --- a/test/array_ref.cpp +++ b/test/array_ref.cpp @@ -26,7 +26,7 @@ TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_vector_char) std::vector v2; msgpack::type::array_ref > ar2(v2); upd.get().convert(ar2); - EXPECT_EQ(ar1, ar2); + EXPECT_TRUE(ar1 == ar2); } TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_vector_char_const) @@ -48,7 +48,7 @@ TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_vector_char_const) std::vector v2; msgpack::type::array_ref > ar2(v2); upd.get().convert(ar2); - EXPECT_EQ(ar1, ar2); + EXPECT_TRUE(ar1 == ar2); } TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_vector_unsigned_char) @@ -68,7 +68,7 @@ TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_vector_unsigned_char) std::vector v2; msgpack::type::array_ref > ar2(v2); upd.get().convert(ar2); - EXPECT_EQ(ar1, ar2); + EXPECT_TRUE(ar1 == ar2); } TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_vector_unsigned_char_const) @@ -90,7 +90,7 @@ TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_vector_unsigned_char_const) std::vector v2; msgpack::type::array_ref > ar2(v2); upd.get().convert(ar2); - EXPECT_EQ(ar1, ar2); + EXPECT_TRUE(ar1 == ar2); } TEST(MSGPACK_ARRAY_REF, object_with_zone_vector_char) @@ -108,7 +108,7 @@ TEST(MSGPACK_ARRAY_REF, object_with_zone_vector_char) std::vector v2; msgpack::type::array_ref > ar2(v2); obj.convert(ar2); - EXPECT_EQ(ar1, ar2); + EXPECT_TRUE(ar1 == ar2); } TEST(MSGPACK_ARRAY_REF, object_with_zone_vector_char_const) @@ -128,7 +128,7 @@ TEST(MSGPACK_ARRAY_REF, object_with_zone_vector_char_const) std::vector v2; msgpack::type::array_ref > ar2(v2); obj.convert(ar2); - EXPECT_EQ(ar1, ar2); + EXPECT_TRUE(ar1 == ar2); } TEST(MSGPACK_ARRAY_REF, object_with_zone_vector_unsigned_char) @@ -146,7 +146,7 @@ TEST(MSGPACK_ARRAY_REF, object_with_zone_vector_unsigned_char) std::vector v2; msgpack::type::array_ref > ar2(v2); obj.convert(ar2); - EXPECT_EQ(ar1, ar2); + EXPECT_TRUE(ar1 == ar2); } TEST(MSGPACK_ARRAY_REF, object_with_zone_vector_unsigned_char_const) @@ -166,7 +166,7 @@ TEST(MSGPACK_ARRAY_REF, object_with_zone_vector_unsigned_char_const) std::vector v2; msgpack::type::array_ref > ar2(v2); obj.convert(ar2); - EXPECT_EQ(ar1, ar2); + EXPECT_TRUE(ar1 == ar2); } #if !defined(MSGPACK_USE_CPP03) @@ -185,7 +185,7 @@ TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_array_char) std::array v2; msgpack::type::array_ref > ar2(v2); upd.get().convert(ar2); - EXPECT_EQ(ar1, ar2); + EXPECT_TRUE(ar1 == ar2); } TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_array_char_const) @@ -204,7 +204,7 @@ TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_array_char_const) std::array v2; msgpack::type::array_ref > ar2(v2); upd.get().convert(ar2); - EXPECT_EQ(ar1, ar2); + EXPECT_TRUE(ar1 == ar2); } TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_array_unsigned_char) @@ -221,7 +221,7 @@ TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_array_unsigned_char) std::array v2; msgpack::type::array_ref > ar2(v2); upd.get().convert(ar2); - EXPECT_EQ(ar1, ar2); + EXPECT_TRUE(ar1 == ar2); } TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_array_unsigned_char_const) @@ -240,7 +240,7 @@ TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_array_unsigned_char_const) std::array v2; msgpack::type::array_ref > ar2(v2); upd.get().convert(ar2); - EXPECT_EQ(ar1, ar2); + EXPECT_TRUE(ar1 == ar2); } TEST(MSGPACK_ARRAY_REF, object_with_zone_array_char) @@ -255,7 +255,7 @@ TEST(MSGPACK_ARRAY_REF, object_with_zone_array_char) std::array v2; msgpack::type::array_ref > ar2(v2); obj.convert(ar2); - EXPECT_EQ(ar1, ar2); + EXPECT_TRUE(ar1 == ar2); } TEST(MSGPACK_ARRAY_REF, object_with_zone_array_char_const) @@ -272,7 +272,7 @@ TEST(MSGPACK_ARRAY_REF, object_with_zone_array_char_const) std::array v2; msgpack::type::array_ref > ar2(v2); obj.convert(ar2); - EXPECT_EQ(ar1, ar2); + EXPECT_TRUE(ar1 == ar2); } TEST(MSGPACK_ARRAY_REF, object_with_zone_array_unsigned_char) @@ -287,7 +287,7 @@ TEST(MSGPACK_ARRAY_REF, object_with_zone_array_unsigned_char) std::array v2; msgpack::type::array_ref > ar2(v2); obj.convert(ar2); - EXPECT_EQ(ar1, ar2); + EXPECT_TRUE(ar1 == ar2); } TEST(MSGPACK_ARRAY_REF, object_with_zone_array_unsigned_char_const) @@ -304,7 +304,7 @@ TEST(MSGPACK_ARRAY_REF, object_with_zone_array_unsigned_char_const) std::array v2; msgpack::type::array_ref > ar2(v2); obj.convert(ar2); - EXPECT_EQ(ar1, ar2); + EXPECT_TRUE(ar1 == ar2); } #endif // !defined(MSGPACK_USE_CPP03) From ee65a319ba18062deb975605f524ec98d808c32b Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Wed, 18 Nov 2015 08:29:35 +0900 Subject: [PATCH 4/5] Replaced EXPECT_EQ with EXPECT_TRUE to avoid ostream requirement. --- test/object_with_zone.cpp | 68 +++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/test/object_with_zone.cpp b/test/object_with_zone.cpp index 6b69f20f..9e3a80dd 100644 --- a/test/object_with_zone.cpp +++ b/test/object_with_zone.cpp @@ -203,7 +203,7 @@ TEST(object_with_zone, vector) v1.push_back(i); msgpack::zone z; msgpack::object obj(v1, z); - EXPECT_EQ(obj.as >(), v1); + EXPECT_TRUE(obj.as >() == v1); v1.front() = 42; EXPECT_EQ(obj.as >().front(), 1); } @@ -219,7 +219,7 @@ TEST(object_with_zone, vector_char) v1.push_back(static_cast(i)); msgpack::zone z; msgpack::object obj(v1, z); - EXPECT_EQ(obj.as >(), v1); + EXPECT_TRUE(obj.as >() == v1); v1.front() = 42; EXPECT_EQ(obj.as >().front(), 1); } @@ -233,7 +233,7 @@ TEST(object_without_zone, vector_char) for (unsigned int i = 1; i < kElements; i++) v1.push_back(static_cast(i)); msgpack::object obj(v1); - EXPECT_EQ(obj.as >(), v1); + EXPECT_TRUE(obj.as >() == v1); v1.front() = 42; // obj refer to v1 EXPECT_EQ(obj.as >().front(), 42); @@ -251,7 +251,7 @@ TEST(object_with_zone, vector_unsigned_char) v1.push_back(static_cast(i)); msgpack::zone z; msgpack::object obj(v1, z); - EXPECT_EQ(obj.as >(), v1); + EXPECT_TRUE(obj.as >() == v1); v1.front() = 42; EXPECT_EQ(obj.as >().front(), 1); } @@ -266,7 +266,7 @@ TEST(object_without_zone, vector_unsigned_char) for (unsigned int i = 1; i < kElements; i++) v1.push_back(static_cast(i)); msgpack::object obj(v1); - EXPECT_EQ(obj.as >(), v1); + EXPECT_TRUE(obj.as >() == v1); v1.front() = 42; // obj refer to v1 EXPECT_EQ(obj.as >().front(), 42); @@ -283,7 +283,7 @@ TEST(object_with_zone, list) v1.push_back(i); msgpack::zone z; msgpack::object obj(v1, z); - EXPECT_EQ(obj.as >(), v1); + EXPECT_TRUE(obj.as >() == v1); v1.front() = 42; EXPECT_EQ(obj.as >().front(), 1); } @@ -299,7 +299,7 @@ TEST(object_with_zone, deque) v1.push_back(i); msgpack::zone z; msgpack::object obj(v1, z); - EXPECT_EQ(obj.as >(), v1); + EXPECT_TRUE(obj.as >() == v1); v1.front() = 42; EXPECT_EQ(obj.as >().front(), 1); } @@ -355,12 +355,12 @@ TEST(object_with_zone, raw_ref) msgpack::type::raw_ref v(s.data(), static_cast(s.size())); msgpack::zone z; msgpack::object obj(v, z); - EXPECT_EQ(obj.as(), v); + EXPECT_TRUE(obj.as() == v); s[0] = 'd'; // even if with_zone, not copied due to raw_ref // Basically, the combination raw_ref and object::wit_zone // is meaningless. - EXPECT_EQ(obj.as(), v); + EXPECT_TRUE(obj.as() == v); } TEST(object_without_zone, raw_ref) @@ -369,9 +369,9 @@ TEST(object_without_zone, raw_ref) msgpack::type::raw_ref v(s.data(), static_cast(s.size())); msgpack::zone z; msgpack::object obj(v); - EXPECT_EQ(obj.as(), v); + EXPECT_TRUE(obj.as() == v); s[0] = 'd'; - EXPECT_EQ(obj.as(), v); + EXPECT_TRUE(obj.as() == v); } // pair @@ -381,7 +381,7 @@ TEST(object_with_zone, pair) test_t v(1, "abc"); msgpack::zone z; msgpack::object obj(v, z); - EXPECT_EQ(obj.as(), v); + EXPECT_TRUE(obj.as() == v); v.first = 42; EXPECT_EQ(obj.as().first, 1); } @@ -395,7 +395,7 @@ TEST(object_with_zone, set) v1.insert(i); msgpack::zone z; msgpack::object obj(v1, z); - EXPECT_EQ(obj.as >(), v1); + EXPECT_TRUE(obj.as >() == v1); } } @@ -408,7 +408,7 @@ TEST(object_with_zone, multiset) v1.insert(i % (kElements / 2)); msgpack::zone z; msgpack::object obj(v1, z); - EXPECT_EQ(obj.as >(), v1); + EXPECT_TRUE(obj.as >() == v1); } } @@ -422,7 +422,7 @@ TEST(object_with_zone, map) v1.insert(std::make_pair(i, i*2)); msgpack::zone z; msgpack::object obj(v1, z); - EXPECT_EQ(obj.as(), v1); + EXPECT_TRUE(obj.as() == v1); } } @@ -436,7 +436,7 @@ TEST(object_with_zone, multimap) v1.insert(std::make_pair(i % (kElements / 2), i*2)); msgpack::zone z; msgpack::object obj(v1, z); - EXPECT_EQ(obj.as(), v1); + EXPECT_TRUE(obj.as() == v1); } } @@ -825,7 +825,7 @@ TEST(object_with_zone, array) v1[i] = rand(); msgpack::zone z; msgpack::object obj(v1, z); - EXPECT_EQ(obj.as(), v1); + EXPECT_TRUE(obj.as() == v1); v1.front() = 42; EXPECT_EQ(obj.as().front(), 1); } @@ -841,7 +841,7 @@ TEST(object_with_zone, array_char) v1[i] = rand(); msgpack::zone z; msgpack::object obj(v1, z); - EXPECT_EQ(obj.as(), v1); + EXPECT_TRUE(obj.as() == v1); v1.front() = 42; EXPECT_EQ(obj.as().front(), 1); } @@ -856,7 +856,7 @@ TEST(object_without_zone, array_char) for (unsigned int i = 1; i < kElements; i++) v1[i] = rand(); msgpack::object obj(v1); - EXPECT_EQ(obj.as(), v1); + EXPECT_TRUE(obj.as() == v1); v1.front() = 42; // obj refer to v1 EXPECT_EQ(obj.as().front(), 42); @@ -874,7 +874,7 @@ TEST(object_with_zone, array_unsigned_char) v1[i] = rand(); msgpack::zone z; msgpack::object obj(v1, z); - EXPECT_EQ(obj.as(), v1); + EXPECT_TRUE(obj.as() == v1); v1.front() = 42; EXPECT_EQ(obj.as().front(), 1); } @@ -890,7 +890,7 @@ TEST(object_without_zone, array_unsigned_char) for (unsigned int i = 1; i < kElements; i++) v1[i] = rand(); msgpack::object obj(v1); - EXPECT_EQ(obj.as(), v1); + EXPECT_TRUE(obj.as() == v1); v1.front() = 42; // obj refer to v1 EXPECT_EQ(obj.as().front(), 42); @@ -906,7 +906,7 @@ TEST(object_with_zone, forward_list) v1.push_front(i); msgpack::zone z; msgpack::object obj(v1, z); - EXPECT_EQ(obj.as >(), v1); + EXPECT_TRUE(obj.as >() == v1); v1.front() = 42; EXPECT_EQ(obj.as >().front(), static_cast(kElements - 1)); } @@ -918,7 +918,7 @@ TEST(object_with_zone, tuple) test_t v(1, "abc", true); msgpack::zone z; msgpack::object obj(v, z); - EXPECT_EQ(obj.as(), v); + EXPECT_TRUE(obj.as() == v); } TEST(object_with_zone, tuple_empty) @@ -927,7 +927,7 @@ TEST(object_with_zone, tuple_empty) test_t v; msgpack::zone z; msgpack::object obj(v, z); - EXPECT_EQ(obj.as(), v); + EXPECT_TRUE(obj.as() == v); } #endif // !defined(MSGPACK_USE_CPP03) @@ -937,8 +937,8 @@ TEST(object_with_zone, ext_empty) msgpack::type::ext v; msgpack::zone z; msgpack::object obj(v, z); - EXPECT_EQ(obj.as(), v); - EXPECT_EQ(obj.as(), v); + EXPECT_TRUE(obj.as() == v); + EXPECT_TRUE(obj.as() == v); } TEST(object_with_zone, ext) @@ -947,8 +947,8 @@ TEST(object_with_zone, ext) for (int i = 0; i < 10; ++i) v.data()[i] = i; msgpack::zone z; msgpack::object obj(v, z); - EXPECT_EQ(obj.as(), v); - EXPECT_EQ(obj.as(), v); + EXPECT_TRUE(obj.as() == v); + EXPECT_TRUE(obj.as() == v); } TEST(object_with_zone, ext_from_buf) @@ -957,8 +957,8 @@ TEST(object_with_zone, ext_from_buf) msgpack::type::ext v(42, buf, sizeof(buf)); msgpack::zone z; msgpack::object obj(v, z); - EXPECT_EQ(obj.as(), v); - EXPECT_EQ(obj.as(), v); + EXPECT_TRUE(obj.as() == v); + EXPECT_TRUE(obj.as() == v); } TEST(object_with_zone, ext_ref_empty) @@ -966,8 +966,8 @@ TEST(object_with_zone, ext_ref_empty) msgpack::type::ext_ref v; msgpack::zone z; msgpack::object obj(v, z); - EXPECT_EQ(obj.as(), v); - EXPECT_EQ(obj.as(), v); + EXPECT_TRUE(obj.as() == v); + EXPECT_TRUE(obj.as() == v); } TEST(object_with_zone, ext_ref_from_buf) @@ -976,6 +976,6 @@ TEST(object_with_zone, ext_ref_from_buf) msgpack::type::ext_ref v(buf, sizeof(buf)); msgpack::zone z; msgpack::object obj(v, z); - EXPECT_EQ(obj.as(), v); - EXPECT_EQ(obj.as(), v); + EXPECT_TRUE(obj.as() == v); + EXPECT_TRUE(obj.as() == v); } From b8ee27c6722a8a784e6112463624e7d18451179c Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Thu, 19 Nov 2015 09:22:40 +0900 Subject: [PATCH 5/5] Replaced EXPECT_EQ with EXPECT_TRUE to avoid ostream requirement. --- test/raw.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/raw.cpp b/test/raw.cpp index 36252d49..33bd4748 100644 --- a/test/raw.cpp +++ b/test/raw.cpp @@ -26,7 +26,7 @@ TEST(MSGPACK_RAW_REF, pack_unpack) msgpack::unpacked upd; msgpack::unpack(upd, ss.str().data(), ss.str().size()); msgpack::type::raw_ref rr2 = upd.get().as(); - EXPECT_EQ(rr1, rr2); + EXPECT_TRUE(rr1 == rr2); } TEST(MSGPACK_RAW_REF, pack_unpack_8_l) @@ -43,7 +43,7 @@ TEST(MSGPACK_RAW_REF, pack_unpack_8_l) msgpack::unpacked upd; msgpack::unpack(upd, ss.str().data(), ss.str().size()); msgpack::type::raw_ref rr2 = upd.get().as(); - EXPECT_EQ(rr1, rr2); + EXPECT_TRUE(rr1 == rr2); } TEST(MSGPACK_RAW_REF, pack_unpack_8_h) @@ -61,7 +61,7 @@ TEST(MSGPACK_RAW_REF, pack_unpack_8_h) msgpack::unpacked upd; msgpack::unpack(upd, ss.str().data(), ss.str().size()); msgpack::type::raw_ref rr2 = upd.get().as(); - EXPECT_EQ(rr1, rr2); + EXPECT_TRUE(rr1 == rr2); } TEST(MSGPACK_RAW_REF, pack_unpack_16_l) @@ -80,7 +80,7 @@ TEST(MSGPACK_RAW_REF, pack_unpack_16_l) msgpack::unpacked upd; msgpack::unpack(upd, ss.str().data(), ss.str().size()); msgpack::type::raw_ref rr2 = upd.get().as(); - EXPECT_EQ(rr1, rr2); + EXPECT_TRUE(rr1 == rr2); } TEST(MSGPACK_RAW_REF, pack_unpack_16_h) @@ -99,7 +99,7 @@ TEST(MSGPACK_RAW_REF, pack_unpack_16_h) msgpack::unpacked upd; msgpack::unpack(upd, ss.str().data(), ss.str().size()); msgpack::type::raw_ref rr2 = upd.get().as(); - EXPECT_EQ(rr1, rr2); + EXPECT_TRUE(rr1 == rr2); } TEST(MSGPACK_RAW_REF, pack_unpack_32_l) @@ -120,7 +120,7 @@ TEST(MSGPACK_RAW_REF, pack_unpack_32_l) msgpack::unpacked upd; msgpack::unpack(upd, ss.str().data(), ss.str().size()); msgpack::type::raw_ref rr2 = upd.get().as(); - EXPECT_EQ(rr1, rr2); + EXPECT_TRUE(rr1 == rr2); } TEST(MSGPACK_V4RAW_REF, pack_unpack) @@ -139,7 +139,7 @@ TEST(MSGPACK_V4RAW_REF, pack_unpack) msgpack::unpacked upd; msgpack::unpack(upd, ss.str().data(), ss.str().size()); msgpack::type::v4raw_ref rr2 = upd.get().as(); - EXPECT_EQ(rr1, rr2); + EXPECT_TRUE(rr1 == rr2); } TEST(MSGPACK_V4RAW_REF, pack_unpack_fix_l) @@ -155,7 +155,7 @@ TEST(MSGPACK_V4RAW_REF, pack_unpack_fix_l) msgpack::unpacked upd; msgpack::unpack(upd, ss.str().data(), ss.str().size()); msgpack::type::v4raw_ref rr2 = upd.get().as(); - EXPECT_EQ(rr1, rr2); + EXPECT_TRUE(rr1 == rr2); } TEST(MSGPACK_V4RAW_REF, pack_unpack_fix_h) @@ -172,7 +172,7 @@ TEST(MSGPACK_V4RAW_REF, pack_unpack_fix_h) msgpack::unpacked upd; msgpack::unpack(upd, ss.str().data(), ss.str().size()); msgpack::type::v4raw_ref rr2 = upd.get().as(); - EXPECT_EQ(rr1, rr2); + EXPECT_TRUE(rr1 == rr2); } TEST(MSGPACK_V4RAW_REF, pack_unpack_16_l) @@ -191,7 +191,7 @@ TEST(MSGPACK_V4RAW_REF, pack_unpack_16_l) msgpack::unpacked upd; msgpack::unpack(upd, ss.str().data(), ss.str().size()); msgpack::type::v4raw_ref rr2 = upd.get().as(); - EXPECT_EQ(rr1, rr2); + EXPECT_TRUE(rr1 == rr2); } TEST(MSGPACK_V4RAW_REF, pack_unpack_16_h) @@ -210,7 +210,7 @@ TEST(MSGPACK_V4RAW_REF, pack_unpack_16_h) msgpack::unpacked upd; msgpack::unpack(upd, ss.str().data(), ss.str().size()); msgpack::type::v4raw_ref rr2 = upd.get().as(); - EXPECT_EQ(rr1, rr2); + EXPECT_TRUE(rr1 == rr2); } TEST(MSGPACK_V4RAW_REF, pack_unpack_32_l) @@ -231,5 +231,5 @@ TEST(MSGPACK_V4RAW_REF, pack_unpack_32_l) msgpack::unpacked upd; msgpack::unpack(upd, ss.str().data(), ss.str().size()); msgpack::type::v4raw_ref rr2 = upd.get().as(); - EXPECT_EQ(rr1, rr2); + EXPECT_TRUE(rr1 == rr2); }