mirror of
https://github.com/msgpack/msgpack-c.git
synced 2025-10-17 03:03:24 +02:00
Merge branch 'fix_382' of https://github.com/redboltz/msgpack-c into redboltz-fix_382
This commit is contained in:
@@ -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")
|
||||
@@ -124,12 +129,6 @@ int main(int argc, char * argv[])
|
||||
}
|
||||
" MSGPACK_ENABLE_GCC_CXX_ATOMIC)
|
||||
|
||||
IF (MSGPACK_ENABLE_GCC_CXX_ATOMIC)
|
||||
LIST (APPEND msgpackc_SOURCES
|
||||
src/gcc_atomic.cpp
|
||||
)
|
||||
ENDIF ()
|
||||
|
||||
|
||||
LIST (APPEND msgpackc_SOURCES
|
||||
src/unpack.c
|
||||
@@ -283,10 +282,22 @@ ENDIF ()
|
||||
|
||||
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||
IF (MSGPACK_ENABLE_SHARED)
|
||||
SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Wno-mismatched-tags -Werror -g -O3 -DPIC")
|
||||
SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 -DPIC")
|
||||
ENDIF ()
|
||||
SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Wno-mismatched-tags -Werror -g -O3" )
|
||||
SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3" )
|
||||
ENDIF ()
|
||||
|
||||
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||
SET_PROPERTY (TARGET msgpackc 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 msgpackc 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}")
|
||||
|
@@ -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}")
|
||||
|
@@ -20,8 +20,20 @@ FOREACH (source_file ${exec_PROGRAMS})
|
||||
msgpackc
|
||||
)
|
||||
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}")
|
||||
|
@@ -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}")
|
||||
|
@@ -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}")
|
||||
|
@@ -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}")
|
||||
|
@@ -26,7 +26,7 @@ TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_vector_char)
|
||||
std::vector<char> v2;
|
||||
msgpack::type::array_ref<std::vector<char> > 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<char> v2;
|
||||
msgpack::type::array_ref<std::vector<char> > 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<unsigned char> v2;
|
||||
msgpack::type::array_ref<std::vector<unsigned char> > 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<unsigned char> v2;
|
||||
msgpack::type::array_ref<std::vector<unsigned char> > 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<char> v2;
|
||||
msgpack::type::array_ref<std::vector<char> > 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<char> v2;
|
||||
msgpack::type::array_ref<std::vector<char> > 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<unsigned char> v2;
|
||||
msgpack::type::array_ref<std::vector<unsigned char> > 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<unsigned char> v2;
|
||||
msgpack::type::array_ref<std::vector<unsigned char> > 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<char, 3> v2;
|
||||
msgpack::type::array_ref<std::array<char, 3> > 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<char, 3> v2;
|
||||
msgpack::type::array_ref<std::array<char, 3> > 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<unsigned char, 3> v2;
|
||||
msgpack::type::array_ref<std::array<unsigned char, 3> > 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<unsigned char, 3> v2;
|
||||
msgpack::type::array_ref<std::array<unsigned char, 3> > 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<char, 3> v2;
|
||||
msgpack::type::array_ref<std::array<char, 3> > 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<char, 3> v2;
|
||||
msgpack::type::array_ref<std::array<char, 3> > 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<unsigned char, 3> v2;
|
||||
msgpack::type::array_ref<std::array<unsigned char, 3> > 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<unsigned char, 3> v2;
|
||||
msgpack::type::array_ref<std::array<unsigned char, 3> > ar2(v2);
|
||||
obj.convert(ar2);
|
||||
EXPECT_EQ(ar1, ar2);
|
||||
EXPECT_TRUE(ar1 == ar2);
|
||||
}
|
||||
|
||||
#endif // !defined(MSGPACK_USE_CPP03)
|
||||
|
@@ -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<msgpack::type::variant>();
|
||||
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<uint64_t>(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<msgpack::type::variant>();
|
||||
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<uint64_t>(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<msgpack::type::variant>();
|
||||
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<uint64_t>(val2));
|
||||
EXPECT_TRUE(val1 == val2);
|
||||
}
|
||||
|
@@ -408,7 +408,7 @@ TEST(MSGPACK, simple_buffer_fixext_1byte_255)
|
||||
msgpack::sbuffer sbuf;
|
||||
msgpack::packer<msgpack::sbuffer> packer(sbuf);
|
||||
char buf[size];
|
||||
for (int i = 0; i != size; ++i) buf[i] = static_cast<char>(i);
|
||||
for (std::size_t i = 0; i != size; ++i) buf[i] = static_cast<char>(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<msgpack::sbuffer> packer(sbuf);
|
||||
char buf[size];
|
||||
for (int i = 0; i != size; ++i) buf[i] = static_cast<char>(i);
|
||||
for (std::size_t i = 0; i != size; ++i) buf[i] = static_cast<char>(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<msgpack::sbuffer> packer(sbuf);
|
||||
char buf[size];
|
||||
for (int i = 0; i != size; ++i) buf[i] = static_cast<char>(i);
|
||||
for (std::size_t i = 0; i != size; ++i) buf[i] = static_cast<char>(i);
|
||||
packer.pack_ext(sizeof(buf), 77);
|
||||
packer.pack_ext_body(buf, sizeof(buf));
|
||||
|
||||
|
@@ -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);
|
||||
|
@@ -146,7 +146,7 @@ TEST(MSGPACK_STL, simple_buffer_assoc_vector)
|
||||
|
||||
TEST(MSGPACK_STL, simple_buffer_map)
|
||||
{
|
||||
typedef map<int, int, test::less<int>, test::allocator<std::pair<int, int> > > type;
|
||||
typedef map<int, int, test::less<int>, test::allocator<std::pair<const int, int> > > 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<int, int, test::less<int>, test::allocator<std::pair<int, int> > > type;
|
||||
typedef multimap<int, int, test::less<int>, test::allocator<std::pair<const int, int> > > 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<int, int, test::tr1_hash<int>, test::equal_to<int>, test::allocator<std::pair<int, int> > > type;
|
||||
typedef tr1::unordered_multimap<int, int, test::tr1_hash<int>, test::equal_to<int>, test::allocator<std::pair<const int, int> > > type;
|
||||
for (unsigned int k = 0; k < kLoop; k++) {
|
||||
type val1;
|
||||
for (unsigned int i = 0; i < kElements; i++) {
|
||||
|
@@ -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<uint64_t>(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<uint64_t>(elem), obj.via.u64);
|
||||
}
|
||||
|
||||
#if !defined(MSGPACK_USE_CPP03)
|
||||
|
@@ -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<vector<int> >(), v1);
|
||||
EXPECT_TRUE(obj.as<vector<int> >() == v1);
|
||||
v1.front() = 42;
|
||||
EXPECT_EQ(obj.as<vector<int> >().front(), 1);
|
||||
}
|
||||
@@ -219,7 +219,7 @@ TEST(object_with_zone, vector_char)
|
||||
v1.push_back(static_cast<char>(i));
|
||||
msgpack::zone z;
|
||||
msgpack::object obj(v1, z);
|
||||
EXPECT_EQ(obj.as<vector<char> >(), v1);
|
||||
EXPECT_TRUE(obj.as<vector<char> >() == v1);
|
||||
v1.front() = 42;
|
||||
EXPECT_EQ(obj.as<vector<char> >().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<char>(i));
|
||||
msgpack::object obj(v1);
|
||||
EXPECT_EQ(obj.as<vector<char> >(), v1);
|
||||
EXPECT_TRUE(obj.as<vector<char> >() == v1);
|
||||
v1.front() = 42;
|
||||
// obj refer to v1
|
||||
EXPECT_EQ(obj.as<vector<char> >().front(), 42);
|
||||
@@ -251,7 +251,7 @@ TEST(object_with_zone, vector_unsigned_char)
|
||||
v1.push_back(static_cast<unsigned char>(i));
|
||||
msgpack::zone z;
|
||||
msgpack::object obj(v1, z);
|
||||
EXPECT_EQ(obj.as<vector<unsigned char> >(), v1);
|
||||
EXPECT_TRUE(obj.as<vector<unsigned char> >() == v1);
|
||||
v1.front() = 42;
|
||||
EXPECT_EQ(obj.as<vector<unsigned char> >().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<unsigned char>(i));
|
||||
msgpack::object obj(v1);
|
||||
EXPECT_EQ(obj.as<vector<unsigned char> >(), v1);
|
||||
EXPECT_TRUE(obj.as<vector<unsigned char> >() == v1);
|
||||
v1.front() = 42;
|
||||
// obj refer to v1
|
||||
EXPECT_EQ(obj.as<vector<unsigned char> >().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<list<int> >(), v1);
|
||||
EXPECT_TRUE(obj.as<list<int> >() == v1);
|
||||
v1.front() = 42;
|
||||
EXPECT_EQ(obj.as<list<int> >().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<deque<int> >(), v1);
|
||||
EXPECT_TRUE(obj.as<deque<int> >() == v1);
|
||||
v1.front() = 42;
|
||||
EXPECT_EQ(obj.as<deque<int> >().front(), 1);
|
||||
}
|
||||
@@ -355,12 +355,12 @@ TEST(object_with_zone, raw_ref)
|
||||
msgpack::type::raw_ref v(s.data(), static_cast<uint32_t>(s.size()));
|
||||
msgpack::zone z;
|
||||
msgpack::object obj(v, z);
|
||||
EXPECT_EQ(obj.as<msgpack::type::raw_ref>(), v);
|
||||
EXPECT_TRUE(obj.as<msgpack::type::raw_ref>() == 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<msgpack::type::raw_ref>(), v);
|
||||
EXPECT_TRUE(obj.as<msgpack::type::raw_ref>() == 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<uint32_t>(s.size()));
|
||||
msgpack::zone z;
|
||||
msgpack::object obj(v);
|
||||
EXPECT_EQ(obj.as<msgpack::type::raw_ref>(), v);
|
||||
EXPECT_TRUE(obj.as<msgpack::type::raw_ref>() == v);
|
||||
s[0] = 'd';
|
||||
EXPECT_EQ(obj.as<msgpack::type::raw_ref>(), v);
|
||||
EXPECT_TRUE(obj.as<msgpack::type::raw_ref>() == 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<test_t>(), v);
|
||||
EXPECT_TRUE(obj.as<test_t>() == v);
|
||||
v.first = 42;
|
||||
EXPECT_EQ(obj.as<test_t>().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<set<int> >(), v1);
|
||||
EXPECT_TRUE(obj.as<set<int> >() == 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<multiset<int> >(), v1);
|
||||
EXPECT_TRUE(obj.as<multiset<int> >() == 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<test_t >(), v1);
|
||||
EXPECT_TRUE(obj.as<test_t >() == 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<test_t >(), v1);
|
||||
EXPECT_TRUE(obj.as<test_t >() == v1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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<uint64_t>(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<uint64_t>(elem), obj.via.u64);
|
||||
}
|
||||
|
||||
// User defined inheriting classes
|
||||
@@ -825,7 +825,7 @@ TEST(object_with_zone, array)
|
||||
v1[i] = rand();
|
||||
msgpack::zone z;
|
||||
msgpack::object obj(v1, z);
|
||||
EXPECT_EQ(obj.as<test_t>(), v1);
|
||||
EXPECT_TRUE(obj.as<test_t>() == v1);
|
||||
v1.front() = 42;
|
||||
EXPECT_EQ(obj.as<test_t>().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<test_t>(), v1);
|
||||
EXPECT_TRUE(obj.as<test_t>() == v1);
|
||||
v1.front() = 42;
|
||||
EXPECT_EQ(obj.as<test_t>().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<test_t>(), v1);
|
||||
EXPECT_TRUE(obj.as<test_t>() == v1);
|
||||
v1.front() = 42;
|
||||
// obj refer to v1
|
||||
EXPECT_EQ(obj.as<test_t>().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<test_t>(), v1);
|
||||
EXPECT_TRUE(obj.as<test_t>() == v1);
|
||||
v1.front() = 42;
|
||||
EXPECT_EQ(obj.as<test_t>().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<test_t>(), v1);
|
||||
EXPECT_TRUE(obj.as<test_t>() == v1);
|
||||
v1.front() = 42;
|
||||
// obj refer to v1
|
||||
EXPECT_EQ(obj.as<test_t>().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<forward_list<int> >(), v1);
|
||||
EXPECT_TRUE(obj.as<forward_list<int> >() == v1);
|
||||
v1.front() = 42;
|
||||
EXPECT_EQ(obj.as<forward_list<int> >().front(), static_cast<int>(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<test_t>(), v);
|
||||
EXPECT_TRUE(obj.as<test_t>() == 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<test_t>(), v);
|
||||
EXPECT_TRUE(obj.as<test_t>() == 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<msgpack::type::ext>(), v);
|
||||
EXPECT_EQ(obj.as<msgpack::type::ext_ref>(), v);
|
||||
EXPECT_TRUE(obj.as<msgpack::type::ext>() == v);
|
||||
EXPECT_TRUE(obj.as<msgpack::type::ext_ref>() == 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<msgpack::type::ext>(), v);
|
||||
EXPECT_EQ(obj.as<msgpack::type::ext_ref>(), v);
|
||||
EXPECT_TRUE(obj.as<msgpack::type::ext>() == v);
|
||||
EXPECT_TRUE(obj.as<msgpack::type::ext_ref>() == 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<msgpack::type::ext>(), v);
|
||||
EXPECT_EQ(obj.as<msgpack::type::ext_ref>(), v);
|
||||
EXPECT_TRUE(obj.as<msgpack::type::ext>() == v);
|
||||
EXPECT_TRUE(obj.as<msgpack::type::ext_ref>() == 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<msgpack::type::ext>(), v);
|
||||
EXPECT_EQ(obj.as<msgpack::type::ext_ref>(), v);
|
||||
EXPECT_TRUE(obj.as<msgpack::type::ext>() == v);
|
||||
EXPECT_TRUE(obj.as<msgpack::type::ext_ref>() == 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<msgpack::type::ext>(), v);
|
||||
EXPECT_EQ(obj.as<msgpack::type::ext_ref>(), v);
|
||||
EXPECT_TRUE(obj.as<msgpack::type::ext>() == v);
|
||||
EXPECT_TRUE(obj.as<msgpack::type::ext_ref>() == v);
|
||||
}
|
||||
|
24
test/raw.cpp
24
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<msgpack::type::raw_ref>();
|
||||
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<msgpack::type::raw_ref>();
|
||||
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<msgpack::type::raw_ref>();
|
||||
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<msgpack::type::raw_ref>();
|
||||
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<msgpack::type::raw_ref>();
|
||||
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<msgpack::type::raw_ref>();
|
||||
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<msgpack::type::v4raw_ref>();
|
||||
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<msgpack::type::v4raw_ref>();
|
||||
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<msgpack::type::v4raw_ref>();
|
||||
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<msgpack::type::v4raw_ref>();
|
||||
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<msgpack::type::v4raw_ref>();
|
||||
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<msgpack::type::v4raw_ref>();
|
||||
EXPECT_EQ(rr1, rr2);
|
||||
EXPECT_TRUE(rr1 == rr2);
|
||||
}
|
||||
|
Reference in New Issue
Block a user