Skip to content

Commit 39e7856

Browse files
redboltzredboltz
committed
Fixed #382.
Fixed warnings on gcc 4.1.2. Added gcc version checking for adding -std=c++03 flag.
1 parent 1a7aa5e commit 39e7856

File tree

12 files changed

+107
-30
lines changed

12 files changed

+107
-30
lines changed

‎CMakeLists.txt‎

Lines changed: 20 additions & 3 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")
@@ -278,10 +283,22 @@ ENDIF ()
278283

279284
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
280285
IF (MSGPACK_ENABLE_SHARED)
281-
SET_PROPERTY (TARGET msgpack APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Wno-mismatched-tags -Werror -g -O3 -DPIC")
286+
SET_PROPERTY (TARGET msgpack APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 -DPIC")
287+
ENDIF ()
288+
SET_PROPERTY (TARGET msgpack-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3" )
289+
ENDIF ()
290+
291+
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
292+
SET_PROPERTY (TARGET msgpack APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
293+
ENDIF ()
294+
295+
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
296+
IF ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}) OR
297+
(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL ${GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION}))
298+
SET_PROPERTY (TARGET msgpack APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
282299
ENDIF ()
283-
SET_PROPERTY (TARGET msgpack-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Wno-mismatched-tags -Werror -g -O3" )
284300
ENDIF ()
301+
285302
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
286303
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
287304
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
msgpack
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/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
}

‎test/msgpack_basic.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ TEST(MSGPACK, simple_buffer_fixext_1byte_255)
408408
msgpack::sbuffer sbuf;
409409
msgpack::packer<msgpack::sbuffer> packer(sbuf);
410410
char buf[size];
411-
for (int i = 0; i != size; ++i) buf[i] = static_cast<char>(i);
411+
for (std::size_t i = 0; i != size; ++i) buf[i] = static_cast<char>(i);
412412
packer.pack_ext(sizeof(buf), 77);
413413
packer.pack_ext_body(buf, sizeof(buf));
414414

@@ -426,7 +426,7 @@ TEST(MSGPACK, simple_buffer_fixext_2byte_256)
426426
msgpack::sbuffer sbuf;
427427
msgpack::packer<msgpack::sbuffer> packer(sbuf);
428428
char buf[size];
429-
for (int i = 0; i != size; ++i) buf[i] = static_cast<char>(i);
429+
for (std::size_t i = 0; i != size; ++i) buf[i] = static_cast<char>(i);
430430
packer.pack_ext(sizeof(buf), 77);
431431
packer.pack_ext_body(buf, sizeof(buf));
432432

@@ -444,7 +444,7 @@ TEST(MSGPACK, simple_buffer_fixext_2byte_65535)
444444
msgpack::sbuffer sbuf;
445445
msgpack::packer<msgpack::sbuffer> packer(sbuf);
446446
char buf[size];
447-
for (int i = 0; i != size; ++i) buf[i] = static_cast<char>(i);
447+
for (std::size_t i = 0; i != size; ++i) buf[i] = static_cast<char>(i);
448448
packer.pack_ext(sizeof(buf), 77);
449449
packer.pack_ext_body(buf, sizeof(buf));
450450

‎test/msgpack_c.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ TEST(MSGPACKC, simple_buffer_fixext_1byte_255)
521521
{
522522
const size_t size = 255;
523523
char buf[size];
524-
for (int i = 0; i != size; ++i) buf[i] = i;
524+
for (size_t i = 0; i != size; ++i) buf[i] = i;
525525

526526
msgpack_sbuffer sbuf;
527527
msgpack_sbuffer_init(&sbuf);
@@ -548,7 +548,7 @@ TEST(MSGPACKC, simple_buffer_fixext_2byte_256)
548548
{
549549
const size_t size = 256;
550550
char buf[size];
551-
for (int i = 0; i != size; ++i) buf[i] = i;
551+
for (size_t i = 0; i != size; ++i) buf[i] = i;
552552

553553
msgpack_sbuffer sbuf;
554554
msgpack_sbuffer_init(&sbuf);
@@ -575,7 +575,7 @@ TEST(MSGPACKC, simple_buffer_fixext_2byte_65535)
575575
{
576576
const size_t size = 65535;
577577
char buf[size];
578-
for (int i = 0; i != size; ++i) buf[i] = i;
578+
for (size_t i = 0; i != size; ++i) buf[i] = i;
579579

580580
msgpack_sbuffer sbuf;
581581
msgpack_sbuffer_init(&sbuf);
@@ -602,7 +602,7 @@ TEST(MSGPACKC, simple_buffer_fixext_4byte_65536)
602602
{
603603
const size_t size = 65536;
604604
char buf[size];
605-
for (int i = 0; i != size; ++i) buf[i] = i;
605+
for (size_t i = 0; i != size; ++i) buf[i] = i;
606606

607607
msgpack_sbuffer sbuf;
608608
msgpack_sbuffer_init(&sbuf);

‎test/msgpack_container.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ TEST(MSGPACK_STL, simple_buffer_assoc_vector)
146146

147147
TEST(MSGPACK_STL, simple_buffer_map)
148148
{
149-
typedef map<int, int, test::less<int>, test::allocator<std::pair<int, int> > > type;
149+
typedef map<int, int, test::less<int>, test::allocator<std::pair<const int, int> > > type;
150150
for (unsigned int k = 0; k < kLoop; k++) {
151151
type val1;
152152
for (unsigned int i = 0; i < kElements; i++)
@@ -228,7 +228,7 @@ TEST(MSGPACK_STL, simple_buffer_pair)
228228

229229
TEST(MSGPACK_STL, simple_buffer_multimap)
230230
{
231-
typedef multimap<int, int, test::less<int>, test::allocator<std::pair<int, int> > > type;
231+
typedef multimap<int, int, test::less<int>, test::allocator<std::pair<const int, int> > > type;
232232
for (unsigned int k = 0; k < kLoop; k++) {
233233
type val1;
234234
for (unsigned int i = 0; i < kElements; i++) {
@@ -352,7 +352,7 @@ TEST(MSGPACK_TR1, simple_buffer_tr1_unordered_map)
352352

353353
TEST(MSGPACK_TR1, simple_buffer_tr1_unordered_multimap)
354354
{
355-
typedef tr1::unordered_multimap<int, int, test::tr1_hash<int>, test::equal_to<int>, test::allocator<std::pair<int, int> > > type;
355+
typedef tr1::unordered_multimap<int, int, test::tr1_hash<int>, test::equal_to<int>, test::allocator<std::pair<const int, int> > > type;
356356
for (unsigned int k = 0; k < kLoop; k++) {
357357
type val1;
358358
for (unsigned int i = 0; i < kElements; i++) {

0 commit comments

Comments
 (0)