mirror of
https://github.com/msgpack/msgpack-c.git
synced 2025-10-14 06:55:50 +02:00
Fixed #382.
Fixed warnings on gcc 4.1.2. Added gcc version checking for adding -std=c++03 flag.
This commit is contained in:
@@ -14,6 +14,8 @@ SET (prefix ${CMAKE_INSTALL_PREFIX})
|
|||||||
SET (exec_prefix "\${prefix}")
|
SET (exec_prefix "\${prefix}")
|
||||||
SET (libdir "\${exec_prefix}/lib")
|
SET (libdir "\${exec_prefix}/lib")
|
||||||
SET (includedir "\${prefix}/include")
|
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_CXX11 "Using c++11 compiler" OFF)
|
||||||
OPTION (MSGPACK_32BIT "32bit compile" OFF)
|
OPTION (MSGPACK_32BIT "32bit compile" OFF)
|
||||||
@@ -43,7 +45,10 @@ IF (MSGPACK_CXX11)
|
|||||||
ENDIF ()
|
ENDIF ()
|
||||||
ELSE ()
|
ELSE ()
|
||||||
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||||
|
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}")
|
SET (CMAKE_CXX_FLAGS "-std=c++03 ${CMAKE_CXX_FLAGS}")
|
||||||
|
ENDIF ()
|
||||||
ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||||
SET (CMAKE_CXX_FLAGS "-std=c++03 ${CMAKE_CXX_FLAGS}")
|
SET (CMAKE_CXX_FLAGS "-std=c++03 ${CMAKE_CXX_FLAGS}")
|
||||||
ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
|
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 ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||||
IF (MSGPACK_ENABLE_SHARED)
|
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 ()
|
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 ()
|
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_COMPILER_ID}" STREQUAL "MSVC")
|
||||||
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
||||||
STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
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}
|
${source_file}
|
||||||
)
|
)
|
||||||
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
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 ()
|
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_COMPILER_ID}" STREQUAL "MSVC")
|
||||||
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
||||||
STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||||
|
@@ -20,8 +20,20 @@ FOREACH (source_file ${exec_PROGRAMS})
|
|||||||
msgpack
|
msgpack
|
||||||
)
|
)
|
||||||
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
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 ()
|
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_COMPILER_ID}" STREQUAL "MSVC")
|
||||||
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
||||||
STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
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}
|
${source_file}
|
||||||
)
|
)
|
||||||
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
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 ()
|
ENDIF ()
|
||||||
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
|
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
|
||||||
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
||||||
@@ -54,7 +54,7 @@ FOREACH (source_file ${with_pthread_PROGRAMS})
|
|||||||
pthread
|
pthread
|
||||||
)
|
)
|
||||||
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
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 ()
|
ENDIF ()
|
||||||
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
|
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
|
||||||
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
||||||
@@ -86,9 +86,22 @@ FOREACH (source_file ${with_boost_lib_PROGRAMS})
|
|||||||
rt
|
rt
|
||||||
)
|
)
|
||||||
ENDIF ()
|
ENDIF ()
|
||||||
|
|
||||||
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
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 ()
|
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_COMPILER_ID}" STREQUAL "MSVC")
|
||||||
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
||||||
STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||||
|
@@ -15,8 +15,20 @@ IF (MSGPACK_CXX11)
|
|||||||
${source_file}
|
${source_file}
|
||||||
)
|
)
|
||||||
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
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 ()
|
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_COMPILER_ID}" STREQUAL "MSVC")
|
||||||
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
||||||
STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
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})
|
ADD_TEST (${source_file_we} ${source_file_we})
|
||||||
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
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 ()
|
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_COMPILER_ID}" STREQUAL "MSVC")
|
||||||
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4] /WX")
|
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4] /WX")
|
||||||
STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||||
|
@@ -147,7 +147,7 @@ TEST(MSGPACK_BOOST, pack_convert_variant_positive_integer)
|
|||||||
std::stringstream ss;
|
std::stringstream ss;
|
||||||
msgpack::type::variant val1 = 123;
|
msgpack::type::variant val1 = 123;
|
||||||
EXPECT_TRUE(val1.is_uint64_t());
|
EXPECT_TRUE(val1.is_uint64_t());
|
||||||
EXPECT_EQ(val1.as_uint64_t(), 123);
|
EXPECT_EQ(val1.as_uint64_t(), 123U);
|
||||||
|
|
||||||
msgpack::pack(ss, val1);
|
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::unpack(ret, ss.str().data(), ss.str().size());
|
||||||
msgpack::type::variant val2 = ret.get().as<msgpack::type::variant>();
|
msgpack::type::variant val2 = ret.get().as<msgpack::type::variant>();
|
||||||
EXPECT_TRUE(val2.is_uint64_t());
|
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_NO_THROW(boost::get<uint64_t>(val2));
|
||||||
EXPECT_TRUE(val1 == val2);
|
EXPECT_TRUE(val1 == val2);
|
||||||
}
|
}
|
||||||
@@ -164,11 +164,11 @@ TEST(MSGPACK_BOOST, object_variant_positive_integer)
|
|||||||
{
|
{
|
||||||
msgpack::type::variant val1 = 123;
|
msgpack::type::variant val1 = 123;
|
||||||
EXPECT_TRUE(val1.is_uint64_t());
|
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::object obj(val1);
|
||||||
msgpack::type::variant val2 = obj.as<msgpack::type::variant>();
|
msgpack::type::variant val2 = obj.as<msgpack::type::variant>();
|
||||||
EXPECT_TRUE(val2.is_uint64_t());
|
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_NO_THROW(boost::get<uint64_t>(val2));
|
||||||
EXPECT_TRUE(val1 == val2);
|
EXPECT_TRUE(val1 == val2);
|
||||||
}
|
}
|
||||||
@@ -178,11 +178,11 @@ TEST(MSGPACK_BOOST, object_with_zone_variant_positive_integer)
|
|||||||
msgpack::zone z;
|
msgpack::zone z;
|
||||||
msgpack::type::variant val1 = 123;
|
msgpack::type::variant val1 = 123;
|
||||||
EXPECT_TRUE(val1.is_uint64_t());
|
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::object obj(val1, z);
|
||||||
msgpack::type::variant val2 = obj.as<msgpack::type::variant>();
|
msgpack::type::variant val2 = obj.as<msgpack::type::variant>();
|
||||||
EXPECT_TRUE(val2.is_uint64_t());
|
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_NO_THROW(boost::get<uint64_t>(val2));
|
||||||
EXPECT_TRUE(val1 == val2);
|
EXPECT_TRUE(val1 == val2);
|
||||||
}
|
}
|
||||||
|
@@ -408,7 +408,7 @@ TEST(MSGPACK, simple_buffer_fixext_1byte_255)
|
|||||||
msgpack::sbuffer sbuf;
|
msgpack::sbuffer sbuf;
|
||||||
msgpack::packer<msgpack::sbuffer> packer(sbuf);
|
msgpack::packer<msgpack::sbuffer> packer(sbuf);
|
||||||
char buf[size];
|
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(sizeof(buf), 77);
|
||||||
packer.pack_ext_body(buf, sizeof(buf));
|
packer.pack_ext_body(buf, sizeof(buf));
|
||||||
|
|
||||||
@@ -426,7 +426,7 @@ TEST(MSGPACK, simple_buffer_fixext_2byte_256)
|
|||||||
msgpack::sbuffer sbuf;
|
msgpack::sbuffer sbuf;
|
||||||
msgpack::packer<msgpack::sbuffer> packer(sbuf);
|
msgpack::packer<msgpack::sbuffer> packer(sbuf);
|
||||||
char buf[size];
|
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(sizeof(buf), 77);
|
||||||
packer.pack_ext_body(buf, sizeof(buf));
|
packer.pack_ext_body(buf, sizeof(buf));
|
||||||
|
|
||||||
@@ -444,7 +444,7 @@ TEST(MSGPACK, simple_buffer_fixext_2byte_65535)
|
|||||||
msgpack::sbuffer sbuf;
|
msgpack::sbuffer sbuf;
|
||||||
msgpack::packer<msgpack::sbuffer> packer(sbuf);
|
msgpack::packer<msgpack::sbuffer> packer(sbuf);
|
||||||
char buf[size];
|
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(sizeof(buf), 77);
|
||||||
packer.pack_ext_body(buf, sizeof(buf));
|
packer.pack_ext_body(buf, sizeof(buf));
|
||||||
|
|
||||||
|
@@ -521,7 +521,7 @@ TEST(MSGPACKC, simple_buffer_fixext_1byte_255)
|
|||||||
{
|
{
|
||||||
const size_t size = 255;
|
const size_t size = 255;
|
||||||
char buf[size];
|
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 sbuf;
|
||||||
msgpack_sbuffer_init(&sbuf);
|
msgpack_sbuffer_init(&sbuf);
|
||||||
@@ -548,7 +548,7 @@ TEST(MSGPACKC, simple_buffer_fixext_2byte_256)
|
|||||||
{
|
{
|
||||||
const size_t size = 256;
|
const size_t size = 256;
|
||||||
char buf[size];
|
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 sbuf;
|
||||||
msgpack_sbuffer_init(&sbuf);
|
msgpack_sbuffer_init(&sbuf);
|
||||||
@@ -575,7 +575,7 @@ TEST(MSGPACKC, simple_buffer_fixext_2byte_65535)
|
|||||||
{
|
{
|
||||||
const size_t size = 65535;
|
const size_t size = 65535;
|
||||||
char buf[size];
|
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 sbuf;
|
||||||
msgpack_sbuffer_init(&sbuf);
|
msgpack_sbuffer_init(&sbuf);
|
||||||
@@ -602,7 +602,7 @@ TEST(MSGPACKC, simple_buffer_fixext_4byte_65536)
|
|||||||
{
|
{
|
||||||
const size_t size = 65536;
|
const size_t size = 65536;
|
||||||
char buf[size];
|
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 sbuf;
|
||||||
msgpack_sbuffer_init(&sbuf);
|
msgpack_sbuffer_init(&sbuf);
|
||||||
|
@@ -146,7 +146,7 @@ TEST(MSGPACK_STL, simple_buffer_assoc_vector)
|
|||||||
|
|
||||||
TEST(MSGPACK_STL, simple_buffer_map)
|
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++) {
|
for (unsigned int k = 0; k < kLoop; k++) {
|
||||||
type val1;
|
type val1;
|
||||||
for (unsigned int i = 0; i < kElements; i++)
|
for (unsigned int i = 0; i < kElements; i++)
|
||||||
@@ -228,7 +228,7 @@ TEST(MSGPACK_STL, simple_buffer_pair)
|
|||||||
|
|
||||||
TEST(MSGPACK_STL, simple_buffer_multimap)
|
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++) {
|
for (unsigned int k = 0; k < kLoop; k++) {
|
||||||
type val1;
|
type val1;
|
||||||
for (unsigned int i = 0; i < kElements; i++) {
|
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)
|
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++) {
|
for (unsigned int k = 0; k < kLoop; k++) {
|
||||||
type val1;
|
type val1;
|
||||||
for (unsigned int i = 0; i < kElements; i++) {
|
for (unsigned int i = 0; i < kElements; i++) {
|
||||||
|
@@ -294,7 +294,7 @@ TEST(object, construct_enum)
|
|||||||
{
|
{
|
||||||
msgpack::object obj(elem);
|
msgpack::object obj(elem);
|
||||||
EXPECT_EQ(msgpack::type::POSITIVE_INTEGER, obj.type);
|
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)
|
#if !defined(MSGPACK_USE_CPP03)
|
||||||
@@ -312,7 +312,7 @@ TEST(object, construct_enum_outer)
|
|||||||
{
|
{
|
||||||
msgpack::object obj(outer_enum::elem);
|
msgpack::object obj(outer_enum::elem);
|
||||||
EXPECT_EQ(msgpack::type::POSITIVE_INTEGER, obj.type);
|
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)
|
#if !defined(MSGPACK_USE_CPP03)
|
||||||
|
@@ -687,7 +687,7 @@ TEST(object_with_zone, construct_enum)
|
|||||||
msgpack::zone z;
|
msgpack::zone z;
|
||||||
msgpack::object obj(elem, z);
|
msgpack::object obj(elem, z);
|
||||||
EXPECT_EQ(msgpack::type::POSITIVE_INTEGER, obj.type);
|
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)
|
#if !defined(MSGPACK_USE_CPP03)
|
||||||
@@ -707,7 +707,7 @@ TEST(object_with_zone, construct_enum_outer)
|
|||||||
msgpack::zone z;
|
msgpack::zone z;
|
||||||
msgpack::object obj(outer_enum::elem, z);
|
msgpack::object obj(outer_enum::elem, z);
|
||||||
EXPECT_EQ(msgpack::type::POSITIVE_INTEGER, obj.type);
|
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
|
// User defined inheriting classes
|
||||||
|
Reference in New Issue
Block a user