Skip to content

Commit f707c6b

Browse files
committed
Add missing msgpack prefix
1 parent 0d9a21e commit f707c6b

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

include/msgpack/unpack.hpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ inline void unpack_false(msgpack::object& o)
242242

243243
struct unpack_array {
244244
void operator()(unpack_user& u, uint32_t n, msgpack::object& o) const {
245-
if (n > u.limit().array()) throw array_size_overflow("array size overflow");
245+
if (n > u.limit().array()) throw msgpack::array_size_overflow("array size overflow");
246246
o.type = msgpack::type::ARRAY;
247247
o.via.array.size = 0;
248248
o.via.array.ptr = static_cast<msgpack::object*>(u.zone().allocate_align(n*sizeof(msgpack::object)));
@@ -260,7 +260,7 @@ inline void unpack_array_item(msgpack::object& c, msgpack::object const& o)
260260

261261
struct unpack_map {
262262
void operator()(unpack_user& u, uint32_t n, msgpack::object& o) const {
263-
if (n > u.limit().map()) throw map_size_overflow("map size overflow");
263+
if (n > u.limit().map()) throw msgpack::map_size_overflow("map size overflow");
264264
o.type = msgpack::type::MAP;
265265
o.via.map.size = 0;
266266
o.via.map.ptr = static_cast<msgpack::object_kv*>(u.zone().allocate_align(n*sizeof(msgpack::object_kv)));
@@ -287,7 +287,7 @@ inline void unpack_str(unpack_user& u, const char* p, uint32_t l, msgpack::objec
287287
u.set_referenced(true);
288288
}
289289
else {
290-
if (l > u.limit().str()) throw str_size_overflow("str size overflow");
290+
if (l > u.limit().str()) throw msgpack::str_size_overflow("str size overflow");
291291
char* tmp = static_cast<char*>(u.zone().allocate_align(l));
292292
std::memcpy(tmp, p, l);
293293
o.via.str.ptr = tmp;
@@ -303,7 +303,7 @@ inline void unpack_bin(unpack_user& u, const char* p, uint32_t l, msgpack::objec
303303
u.set_referenced(true);
304304
}
305305
else {
306-
if (l > u.limit().bin()) throw bin_size_overflow("bin size overflow");
306+
if (l > u.limit().bin()) throw msgpack::bin_size_overflow("bin size overflow");
307307
char* tmp = static_cast<char*>(u.zone().allocate_align(l));
308308
std::memcpy(tmp, p, l);
309309
o.via.bin.ptr = tmp;
@@ -319,7 +319,7 @@ inline void unpack_ext(unpack_user& u, const char* p, std::size_t l, msgpack::ob
319319
u.set_referenced(true);
320320
}
321321
else {
322-
if (l > u.limit().ext()) throw ext_size_overflow("ext size overflow");
322+
if (l > u.limit().ext()) throw msgpack::ext_size_overflow("ext size overflow");
323323
char* tmp = static_cast<char*>(u.zone().allocate_align(l));
324324
std::memcpy(tmp, p, l);
325325
o.via.ext.ptr = tmp;
@@ -558,7 +558,7 @@ class context {
558558

559559
template <>
560560
inline void context::check_ext_size<4>(std::size_t size) {
561-
if (size == 0xffffffff) throw ext_size_overflow("ext size overflow");
561+
if (size == 0xffffffff) throw msgpack::ext_size_overflow("ext size overflow");
562562
}
563563

564564
inline int context::execute(const char* data, std::size_t len, std::size_t& off)
@@ -1342,7 +1342,7 @@ inline bool unpacker::next(unpacked& result, bool& referenced)
13421342
referenced = false;
13431343
int ret = execute_imp();
13441344
if(ret < 0) {
1345-
throw parse_error("parse error");
1345+
throw msgpack::parse_error("parse error");
13461346
}
13471347

13481348
if(ret == 0) {
@@ -1375,7 +1375,7 @@ inline bool unpacker::execute()
13751375
{
13761376
int ret = execute_imp();
13771377
if(ret < 0) {
1378-
throw parse_error("parse error");
1378+
throw msgpack::parse_error("parse error");
13791379
} else if(ret == 0) {
13801380
return false;
13811381
} else {
@@ -1535,10 +1535,10 @@ inline unpacked unpack(
15351535
case UNPACK_EXTRA_BYTES:
15361536
return unpacked(obj, msgpack::move(z));
15371537
case UNPACK_CONTINUE:
1538-
throw insufficient_bytes("insufficient bytes");
1538+
throw msgpack::insufficient_bytes("insufficient bytes");
15391539
case UNPACK_PARSE_ERROR:
15401540
default:
1541-
throw parse_error("parse error");
1541+
throw msgpack::parse_error("parse error");
15421542
}
15431543
return unpacked();
15441544
}
@@ -1590,10 +1590,10 @@ inline void unpack(unpacked& result,
15901590
result.zone() = msgpack::move(z);
15911591
return;
15921592
case UNPACK_CONTINUE:
1593-
throw insufficient_bytes("insufficient bytes");
1593+
throw msgpack::insufficient_bytes("insufficient bytes");
15941594
case UNPACK_PARSE_ERROR:
15951595
default:
1596-
throw parse_error("parse error");
1596+
throw msgpack::parse_error("parse error");
15971597
}
15981598
}
15991599

@@ -1639,10 +1639,10 @@ inline msgpack::object unpack(
16391639
case UNPACK_EXTRA_BYTES:
16401640
return obj;
16411641
case UNPACK_CONTINUE:
1642-
throw insufficient_bytes("insufficient bytes");
1642+
throw msgpack::insufficient_bytes("insufficient bytes");
16431643
case UNPACK_PARSE_ERROR:
16441644
default:
1645-
throw parse_error("parse error");
1645+
throw msgpack::parse_error("parse error");
16461646
}
16471647
return obj;
16481648
}

0 commit comments

Comments
 (0)