Skip to content

Commit 364658e

Browse files
committed
Merge pull request #360 from redboltz/fixed_warnings_on_release_build
Fixed warnings on build with CMAKE_BUILD_TYPE=Release.
2 parents 5008836 + be0f8c2 commit 364658e

File tree

3 files changed

+66
-13
lines changed

3 files changed

+66
-13
lines changed

example/cpp03/reuse_zone.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ int main() {
4040

4141
// msgpack array is constructed on z.
4242
msgpack::object obj = msgpack::unpack(z, ss.str().data(), ss.str().size(), offset);
43+
std::cout << obj << std::endl;
4344
assert(obj.as<std::vector<int> >() == v);
4445

4546
// msgpack str is constructed on z.
46-
assert(msgpack::unpack(z, ss.str().data(), ss.str().size(), offset).as<std::string>() == s);
47+
std::string const& str = msgpack::unpack(z, ss.str().data(), ss.str().size(), offset).as<std::string>();
48+
std::cout << str << std::endl;
49+
assert(str == s);
4750
}

example/cpp11/container.cpp

Lines changed: 59 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ void array() {
3535

3636
msgpack::unpacked und = msgpack::unpack(ss.str().data(), ss.str().size());
3737
msgpack::object obj = und.get();
38-
std::array<int, 5> const& new_a = obj.as<std::array<int, 5>>();
3938

40-
assert(new_a == a);
39+
std::cout << obj << std::endl;
40+
assert((obj.as<std::array<int, 5>>()) == a);
4141
}
4242

4343
void tuple() {
@@ -47,6 +47,8 @@ void tuple() {
4747

4848
auto und = msgpack::unpack(ss.str().data(), ss.str().size());
4949
auto obj = und.get();
50+
51+
std::cout << obj << std::endl;
5052
assert(obj.as<decltype(t)>() == t);
5153
}
5254

@@ -56,15 +58,22 @@ void unordered_map() {
5658
msgpack::pack(ss, m);
5759

5860
auto und = msgpack::unpack(ss.str().data(), ss.str().size());
59-
assert(und.get().as<decltype(m)>() == m);
61+
msgpack::object obj = und.get();
62+
63+
std::cout << obj << std::endl;
64+
assert(obj.as<decltype(m)>() == m);
6065
}
6166

6267
void unordered_set() {
6368
std::unordered_set<std::string> s { "ABC", "DEF" };
6469
std::stringstream ss;
6570
msgpack::pack(ss, s);
6671

67-
assert(msgpack::unpack(ss.str().data(), ss.str().size()).get().as<decltype(s)>() == s);
72+
auto und = msgpack::unpack(ss.str().data(), ss.str().size());
73+
auto obj = und.get();
74+
75+
std::cout << obj << std::endl;
76+
assert(obj.as<decltype(s)>() == s);
6877
}
6978

7079
void forward_list() {
@@ -73,7 +82,11 @@ void forward_list() {
7382
std::stringstream ss;
7483
msgpack::pack(ss, f);
7584

76-
assert(msgpack::unpack(ss.str().data(), ss.str().size()).get().as<type>() == f);
85+
auto und = msgpack::unpack(ss.str().data(), ss.str().size());
86+
auto obj = und.get();
87+
88+
std::cout << obj << std::endl;
89+
assert(obj.as<type>() == f);
7790
}
7891

7992
void combi() {
@@ -91,11 +104,47 @@ void combi() {
91104
msgpack::pack(ss, f);
92105

93106
std::size_t offset = 0;
94-
assert(msgpack::unpack(ss.str().data(), ss.str().size(), offset).get().as<decltype(a)>() == a);
95-
assert(msgpack::unpack(ss.str().data(), ss.str().size(), offset).get().as<decltype(t)>() == t);
96-
assert(msgpack::unpack(ss.str().data(), ss.str().size(), offset).get().as<decltype(m)>() == m);
97-
assert(msgpack::unpack(ss.str().data(), ss.str().size(), offset).get().as<decltype(s)>() == s);
98-
assert(msgpack::unpack(ss.str().data(), ss.str().size(), offset).get().as<decltype(f)>() == f);
107+
std::cout << "offset: " << offset << std::endl;
108+
{
109+
auto und = msgpack::unpack(ss.str().data(), ss.str().size(), offset);
110+
auto obj = und.get();
111+
112+
std::cout << obj << std::endl;
113+
assert(obj.as<decltype(a)>() == a);
114+
}
115+
std::cout << "offset: " << offset << std::endl;
116+
{
117+
auto und = msgpack::unpack(ss.str().data(), ss.str().size(), offset);
118+
auto obj = und.get();
119+
120+
std::cout << obj << std::endl;
121+
assert(obj.as<decltype(t)>() == t);
122+
}
123+
std::cout << "offset: " << offset << std::endl;
124+
{
125+
auto und = msgpack::unpack(ss.str().data(), ss.str().size(), offset);
126+
auto obj = und.get();
127+
128+
std::cout << obj << std::endl;
129+
assert(obj.as<decltype(m)>() == m);
130+
}
131+
std::cout << "offset: " << offset << std::endl;
132+
{
133+
auto und = msgpack::unpack(ss.str().data(), ss.str().size(), offset);
134+
auto obj = und.get();
135+
136+
std::cout << obj << std::endl;
137+
assert(obj.as<decltype(s)>() == s);
138+
}
139+
std::cout << "offset: " << offset << std::endl;
140+
{
141+
auto und = msgpack::unpack(ss.str().data(), ss.str().size(), offset);
142+
auto obj = und.get();
143+
144+
std::cout << obj << std::endl;
145+
assert(obj.as<decltype(f)>() == f);
146+
}
147+
std::cout << "offset: " << offset << std::endl;
99148
}
100149

101150
int main() {

example/cpp11/non_def_con_class.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include <cassert>
1919
#include <memory>
20+
#include <iostream>
2021

2122
#include <msgpack.hpp>
2223

@@ -53,6 +54,6 @@ int main() {
5354
my m1(42);
5455
msgpack::zone z;
5556
msgpack::object obj(m1, z);
56-
auto m2 = obj.as<my>();
57-
assert(m1.a == m2.a);
57+
std::cout << obj << std::endl;
58+
assert(m1.a == obj.as<my>().a);
5859
}

0 commit comments

Comments
 (0)