Skip to content

Commit c2f523e

Browse files
redboltzredboltz
committed
Merge branch 'fix_382' of https://github.com/redboltz/msgpack-c into redboltz-fix_382
2 parents 1e8f5d0 + b8ee27c commit c2f523e

File tree

14 files changed

+169
-98
lines changed

14 files changed

+169
-98
lines changed

‎CMakeLists.txt‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ SET (prefix ${CMAKE_INSTALL_PREFIX})
1414
SET (exec_prefix "\${prefix}")
1515
SET (libdir "\${exec_prefix}/lib")
1616
SET (includedir "\${prefix}/include")
17+
SET (GNUCXX_STD_SUPPORT_VERSION "4.3")
18+
SET (GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION "4.4")
1719

1820
OPTION (MSGPACK_CXX11 "Using c++11 compiler" OFF)
1921
OPTION (MSGPACK_32BIT "32bit compile" OFF)
@@ -43,7 +45,10 @@ IF (MSGPACK_CXX11)
4345
ENDIF ()
4446
ELSE ()
4547
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
46-
SET (CMAKE_CXX_FLAGS "-std=c++03 ${CMAKE_CXX_FLAGS}")
48+
IF ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER ${GNUCXX_STD_SUPPORT_VERSION}) OR
49+
(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL ${GNUCXX_STD_SUPPORT_VERSION}))
50+
SET (CMAKE_CXX_FLAGS "-std=c++03 ${CMAKE_CXX_FLAGS}")
51+
ENDIF ()
4752
ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
4853
SET (CMAKE_CXX_FLAGS "-std=c++03 ${CMAKE_CXX_FLAGS}")
4954
ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
@@ -124,12 +129,6 @@ int main(int argc, char * argv[])
124129
}
125130
" MSGPACK_ENABLE_GCC_CXX_ATOMIC)
126131

127-
IF (MSGPACK_ENABLE_GCC_CXX_ATOMIC)
128-
LIST (APPEND msgpackc_SOURCES
129-
src/gcc_atomic.cpp
130-
)
131-
ENDIF ()
132-
133132

134133
LIST (APPEND msgpackc_SOURCES
135134
src/unpack.c
@@ -283,10 +282,22 @@ ENDIF ()
283282

284283
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
285284
IF (MSGPACK_ENABLE_SHARED)
286-
SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Wno-mismatched-tags -Werror -g -O3 -DPIC")
285+
SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 -DPIC")
287286
ENDIF ()
288-
SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Wno-mismatched-tags -Werror -g -O3" )
287+
SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3" )
289288
ENDIF ()
289+
290+
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
291+
SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
292+
ENDIF ()
293+
294+
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
295+
IF ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}) OR
296+
(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}))
297+
SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
298+
ENDIF ()
299+
ENDIF ()
300+
290301
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
291302
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
292303
STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

‎example/boost/CMakeLists.txt‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,20 @@ FOREACH (source_file ${exec_PROGRAMS})
1212
${source_file}
1313
)
1414
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
15-
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -Wno-mismatched-tags -g -O3")
15+
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3")
1616
ENDIF ()
17+
18+
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
19+
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
20+
ENDIF ()
21+
22+
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
23+
IF ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}) OR
24+
(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}))
25+
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
26+
ENDIF ()
27+
ENDIF ()
28+
1729
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
1830
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
1931
STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

‎example/c/CMakeLists.txt‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,20 @@ FOREACH (source_file ${exec_PROGRAMS})
2020
msgpackc
2121
)
2222
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
23-
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -Wno-mismatched-tags -g -O3")
23+
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3")
2424
ENDIF ()
25+
26+
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
27+
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
28+
ENDIF ()
29+
30+
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
31+
IF ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}) OR
32+
(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}))
33+
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
34+
ENDIF ()
35+
ENDIF ()
36+
2537
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
2638
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
2739
STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

‎example/cpp03/CMakeLists.txt‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ FOREACH (source_file ${exec_PROGRAMS})
3333
${source_file}
3434
)
3535
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
36-
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -Wno-mismatched-tags -g -O3")
36+
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3")
3737
ENDIF ()
3838
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
3939
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
@@ -54,7 +54,7 @@ FOREACH (source_file ${with_pthread_PROGRAMS})
5454
pthread
5555
)
5656
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
57-
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -Wno-mismatched-tags -g -O3 -pthread")
57+
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 -pthread")
5858
ENDIF ()
5959
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
6060
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
@@ -86,9 +86,22 @@ FOREACH (source_file ${with_boost_lib_PROGRAMS})
8686
rt
8787
)
8888
ENDIF ()
89+
8990
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
90-
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -Wno-mismatched-tags -g -O3")
91+
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -O3")
92+
ENDIF ()
93+
94+
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
95+
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
9196
ENDIF ()
97+
98+
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
99+
IF ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}) OR
100+
(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}))
101+
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
102+
ENDIF ()
103+
ENDIF ()
104+
92105
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
93106
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
94107
STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

‎example/cpp11/CMakeLists.txt‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,20 @@ IF (MSGPACK_CXX11)
1515
${source_file}
1616
)
1717
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
18-
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -Wno-mismatched-tags -g -O3")
18+
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 ")
1919
ENDIF ()
20+
21+
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
22+
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
23+
ENDIF ()
24+
25+
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
26+
IF ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}) OR
27+
(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}))
28+
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
29+
ENDIF ()
30+
ENDIF ()
31+
2032
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
2133
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
2234
STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

‎test/CMakeLists.txt‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,19 @@ FOREACH (source_file ${check_PROGRAMS})
7575
)
7676
ADD_TEST (${source_file_we} ${source_file_we})
7777
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
78-
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -Wno-mismatched-tags -g -O3")
78+
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 ")
7979
ENDIF ()
80+
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
81+
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
82+
ENDIF ()
83+
84+
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
85+
IF ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}) OR
86+
(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}))
87+
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
88+
ENDIF ()
89+
ENDIF ()
90+
8091
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
8192
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4] /WX")
8293
STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

‎test/array_ref.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_vector_char)
2626
std::vector<char> v2;
2727
msgpack::type::array_ref<std::vector<char> > ar2(v2);
2828
upd.get().convert(ar2);
29-
EXPECT_EQ(ar1, ar2);
29+
EXPECT_TRUE(ar1 == ar2);
3030
}
3131

3232
TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_vector_char_const)
@@ -48,7 +48,7 @@ TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_vector_char_const)
4848
std::vector<char> v2;
4949
msgpack::type::array_ref<std::vector<char> > ar2(v2);
5050
upd.get().convert(ar2);
51-
EXPECT_EQ(ar1, ar2);
51+
EXPECT_TRUE(ar1 == ar2);
5252
}
5353

5454
TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_vector_unsigned_char)
@@ -68,7 +68,7 @@ TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_vector_unsigned_char)
6868
std::vector<unsigned char> v2;
6969
msgpack::type::array_ref<std::vector<unsigned char> > ar2(v2);
7070
upd.get().convert(ar2);
71-
EXPECT_EQ(ar1, ar2);
71+
EXPECT_TRUE(ar1 == ar2);
7272
}
7373

7474
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)
9090
std::vector<unsigned char> v2;
9191
msgpack::type::array_ref<std::vector<unsigned char> > ar2(v2);
9292
upd.get().convert(ar2);
93-
EXPECT_EQ(ar1, ar2);
93+
EXPECT_TRUE(ar1 == ar2);
9494
}
9595

9696
TEST(MSGPACK_ARRAY_REF, object_with_zone_vector_char)
@@ -108,7 +108,7 @@ TEST(MSGPACK_ARRAY_REF, object_with_zone_vector_char)
108108
std::vector<char> v2;
109109
msgpack::type::array_ref<std::vector<char> > ar2(v2);
110110
obj.convert(ar2);
111-
EXPECT_EQ(ar1, ar2);
111+
EXPECT_TRUE(ar1 == ar2);
112112
}
113113

114114
TEST(MSGPACK_ARRAY_REF, object_with_zone_vector_char_const)
@@ -128,7 +128,7 @@ TEST(MSGPACK_ARRAY_REF, object_with_zone_vector_char_const)
128128
std::vector<char> v2;
129129
msgpack::type::array_ref<std::vector<char> > ar2(v2);
130130
obj.convert(ar2);
131-
EXPECT_EQ(ar1, ar2);
131+
EXPECT_TRUE(ar1 == ar2);
132132
}
133133

134134
TEST(MSGPACK_ARRAY_REF, object_with_zone_vector_unsigned_char)
@@ -146,7 +146,7 @@ TEST(MSGPACK_ARRAY_REF, object_with_zone_vector_unsigned_char)
146146
std::vector<unsigned char> v2;
147147
msgpack::type::array_ref<std::vector<unsigned char> > ar2(v2);
148148
obj.convert(ar2);
149-
EXPECT_EQ(ar1, ar2);
149+
EXPECT_TRUE(ar1 == ar2);
150150
}
151151

152152
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)
166166
std::vector<unsigned char> v2;
167167
msgpack::type::array_ref<std::vector<unsigned char> > ar2(v2);
168168
obj.convert(ar2);
169-
EXPECT_EQ(ar1, ar2);
169+
EXPECT_TRUE(ar1 == ar2);
170170
}
171171

172172
#if !defined(MSGPACK_USE_CPP03)
@@ -185,7 +185,7 @@ TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_array_char)
185185
std::array<char, 3> v2;
186186
msgpack::type::array_ref<std::array<char, 3> > ar2(v2);
187187
upd.get().convert(ar2);
188-
EXPECT_EQ(ar1, ar2);
188+
EXPECT_TRUE(ar1 == ar2);
189189
}
190190

191191
TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_array_char_const)
@@ -204,7 +204,7 @@ TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_array_char_const)
204204
std::array<char, 3> v2;
205205
msgpack::type::array_ref<std::array<char, 3> > ar2(v2);
206206
upd.get().convert(ar2);
207-
EXPECT_EQ(ar1, ar2);
207+
EXPECT_TRUE(ar1 == ar2);
208208
}
209209

210210
TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_array_unsigned_char)
@@ -221,7 +221,7 @@ TEST(MSGPACK_ARRAY_REF, pack_unpack_convert_array_unsigned_char)
221221
std::array<unsigned char, 3> v2;
222222
msgpack::type::array_ref<std::array<unsigned char, 3> > ar2(v2);
223223
upd.get().convert(ar2);
224-
EXPECT_EQ(ar1, ar2);
224+
EXPECT_TRUE(ar1 == ar2);
225225
}
226226

227227
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)
240240
std::array<unsigned char, 3> v2;
241241
msgpack::type::array_ref<std::array<unsigned char, 3> > ar2(v2);
242242
upd.get().convert(ar2);
243-
EXPECT_EQ(ar1, ar2);
243+
EXPECT_TRUE(ar1 == ar2);
244244
}
245245

246246
TEST(MSGPACK_ARRAY_REF, object_with_zone_array_char)
@@ -255,7 +255,7 @@ TEST(MSGPACK_ARRAY_REF, object_with_zone_array_char)
255255
std::array<char, 3> v2;
256256
msgpack::type::array_ref<std::array<char, 3> > ar2(v2);
257257
obj.convert(ar2);
258-
EXPECT_EQ(ar1, ar2);
258+
EXPECT_TRUE(ar1 == ar2);
259259
}
260260

261261
TEST(MSGPACK_ARRAY_REF, object_with_zone_array_char_const)
@@ -272,7 +272,7 @@ TEST(MSGPACK_ARRAY_REF, object_with_zone_array_char_const)
272272
std::array<char, 3> v2;
273273
msgpack::type::array_ref<std::array<char, 3> > ar2(v2);
274274
obj.convert(ar2);
275-
EXPECT_EQ(ar1, ar2);
275+
EXPECT_TRUE(ar1 == ar2);
276276
}
277277

278278
TEST(MSGPACK_ARRAY_REF, object_with_zone_array_unsigned_char)
@@ -287,7 +287,7 @@ TEST(MSGPACK_ARRAY_REF, object_with_zone_array_unsigned_char)
287287
std::array<unsigned char, 3> v2;
288288
msgpack::type::array_ref<std::array<unsigned char, 3> > ar2(v2);
289289
obj.convert(ar2);
290-
EXPECT_EQ(ar1, ar2);
290+
EXPECT_TRUE(ar1 == ar2);
291291
}
292292

293293
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)
304304
std::array<unsigned char, 3> v2;
305305
msgpack::type::array_ref<std::array<unsigned char, 3> > ar2(v2);
306306
obj.convert(ar2);
307-
EXPECT_EQ(ar1, ar2);
307+
EXPECT_TRUE(ar1 == ar2);
308308
}
309309

310310
#endif // !defined(MSGPACK_USE_CPP03)

‎test/boost_variant.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,15 +147,15 @@ TEST(MSGPACK_BOOST, pack_convert_variant_positive_integer)
147147
std::stringstream ss;
148148
msgpack::type::variant val1 = 123;
149149
EXPECT_TRUE(val1.is_uint64_t());
150-
EXPECT_EQ(val1.as_uint64_t(), 123);
150+
EXPECT_EQ(val1.as_uint64_t(), 123U);
151151

152152
msgpack::pack(ss, val1);
153153

154154
msgpack::unpacked ret;
155155
msgpack::unpack(ret, ss.str().data(), ss.str().size());
156156
msgpack::type::variant val2 = ret.get().as<msgpack::type::variant>();
157157
EXPECT_TRUE(val2.is_uint64_t());
158-
EXPECT_EQ(val2.as_uint64_t(), 123);
158+
EXPECT_EQ(val2.as_uint64_t(), 123U);
159159
EXPECT_NO_THROW(boost::get<uint64_t>(val2));
160160
EXPECT_TRUE(val1 == val2);
161161
}
@@ -164,11 +164,11 @@ TEST(MSGPACK_BOOST, object_variant_positive_integer)
164164
{
165165
msgpack::type::variant val1 = 123;
166166
EXPECT_TRUE(val1.is_uint64_t());
167-
EXPECT_EQ(val1.as_uint64_t(), 123);
167+
EXPECT_EQ(val1.as_uint64_t(), 123U);
168168
msgpack::object obj(val1);
169169
msgpack::type::variant val2 = obj.as<msgpack::type::variant>();
170170
EXPECT_TRUE(val2.is_uint64_t());
171-
EXPECT_EQ(val2.as_uint64_t(), 123);
171+
EXPECT_EQ(val2.as_uint64_t(), 123U);
172172
EXPECT_NO_THROW(boost::get<uint64_t>(val2));
173173
EXPECT_TRUE(val1 == val2);
174174
}
@@ -178,11 +178,11 @@ TEST(MSGPACK_BOOST, object_with_zone_variant_positive_integer)
178178
msgpack::zone z;
179179
msgpack::type::variant val1 = 123;
180180
EXPECT_TRUE(val1.is_uint64_t());
181-
EXPECT_EQ(val1.as_uint64_t(), 123);
181+
EXPECT_EQ(val1.as_uint64_t(), 123U);
182182
msgpack::object obj(val1, z);
183183
msgpack::type::variant val2 = obj.as<msgpack::type::variant>();
184184
EXPECT_TRUE(val2.is_uint64_t());
185-
EXPECT_EQ(val2.as_uint64_t(), 123);
185+
EXPECT_EQ(val2.as_uint64_t(), 123U);
186186
EXPECT_NO_THROW(boost::get<uint64_t>(val2));
187187
EXPECT_TRUE(val1 == val2);
188188
}

0 commit comments

Comments
 (0)