diff --git a/erb/cpp03_define.hpp.erb b/erb/cpp03_define.hpp.erb index bcf175ee..ad2abf5d 100644 --- a/erb/cpp03_define.hpp.erb +++ b/erb/cpp03_define.hpp.erb @@ -43,18 +43,18 @@ #define MSGPACK_ADD_ENUM(enum) \ namespace msgpack { \ MSGPACK_API_VERSION_NAMESPACE(v1) { \ - inline object const& operator>> (object const& o, enum& v) \ + inline msgpack::object const& operator>> (msgpack::object const& o, enum& v) \ { \ int tmp; \ o >> tmp; \ v = static_cast(tmp); \ return o; \ } \ - inline void operator<< (object& o, const enum& v) \ + inline void operator<< (msgpack::object& o, const enum& v) \ { \ o << static_cast(v); \ } \ - inline void operator<< (object::with_zone& o, const enum& v) \ + inline void operator<< (msgpack::object::with_zone& o, const enum& v) \ { \ o << static_cast(v); \ } \ @@ -90,11 +90,11 @@ struct define<> { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } } void msgpack_object(msgpack::object* o, msgpack::zone&) const { - o->type = type::ARRAY; + o->type = msgpack::type::ARRAY; o->via.array.ptr = nullptr; o->via.array.size = 0; } @@ -115,7 +115,7 @@ struct define, A<%=j%><%}%>> { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } const size_t size = o.via.array.size; if(size > 0) { msgpack::object *ptr = o.via.array.ptr; @@ -127,11 +127,11 @@ struct define, A<%=j%><%}%>> { } void msgpack_object(msgpack::object* o, msgpack::zone& z) const { - o->type = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*<%=i+1%>)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*<%=i+1%>)); o->via.array.size = <%=i+1%>; <%0.upto(i) {|j|%> - o->via.array.ptr[<%=j%>] = object(a<%=j%>, z);<%}%> + o->via.array.ptr[<%=j%>] = msgpack::object(a<%=j%>, z);<%}%> } <%0.upto(i) {|j|%> A<%=j%>& a<%=j%>;<%}%> diff --git a/erb/cpp03_msgpack_tuple.hpp.erb b/erb/cpp03_msgpack_tuple.hpp.erb index 9f3534a8..9f86e6e9 100644 --- a/erb/cpp03_msgpack_tuple.hpp.erb +++ b/erb/cpp03_msgpack_tuple.hpp.erb @@ -95,7 +95,7 @@ private: template <> struct tuple<> { tuple() {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } typedef tuple<> value_type; }; <%0.upto(GENERATION_LIMIT) {|i|%> @@ -105,7 +105,7 @@ struct tuple, A<%=j%><%}%>> { tuple() {} tuple(typename tuple_type::transparent_reference _a0<%1.upto(i) {|j|%>, typename tuple_type>::transparent_reference _a<%=j%><%}%>) : a0(_a0)<%1.upto(i) {|j|%>, a<%=j%>(_a<%=j%>)<%}%> {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -136,18 +136,18 @@ inline tuple, A<%=j%><%}%>> make_tuple(typename tuple_type< } // namespace type -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple<>&) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } return o; } <%0.upto(GENERATION_LIMIT) {|i|%> template , typename A<%=j%><%}%>> -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple, A<%=j%><%}%>>& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < <%=i+1%>) { throw type_error(); } <%0.upto(i) {|j|%> o.via.array.ptr[<%=j%>].convert>::type>(v.template get<<%=j%>>());<%}%> @@ -175,22 +175,22 @@ inline const packer& operator<< ( <%}%> inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple<>&) { - o.type = type::ARRAY; + o.type = msgpack::type::ARRAY; o.via.array.ptr = nullptr; o.via.array.size = 0; } <%0.upto(GENERATION_LIMIT) {|i|%> template , typename A<%=j%><%}%>> inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple, A<%=j%><%}%>>& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*<%=i+1%>)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*<%=i+1%>)); o.via.array.size = <%=i+1%>; <%0.upto(i) {|j|%> - o.via.array.ptr[<%=j%>] = object(v.template get<<%=j%>>(), o.zone);<%}%> + o.via.array.ptr[<%=j%>] = msgpack::object(v.template get<<%=j%>>(), o.zone);<%}%> } <%}%> diff --git a/erb/cpp03_msgpack_tuple_fwd.hpp.erb b/erb/cpp03_msgpack_tuple_fwd.hpp.erb index 99cefff0..d5e7003b 100644 --- a/erb/cpp03_msgpack_tuple_fwd.hpp.erb +++ b/erb/cpp03_msgpack_tuple_fwd.hpp.erb @@ -77,14 +77,14 @@ tuple, A<%=j%><%}%>> make_tuple(typename tuple_type::tr } // namespace type -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple<>&); <%0.upto(GENERATION_LIMIT) {|i|%> template , typename A<%=j%><%}%>> -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple, A<%=j%><%}%>>& v); <%}%> @@ -101,12 +101,12 @@ const packer& operator<< ( <%}%> void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple<>&); <%0.upto(GENERATION_LIMIT) {|i|%> template , typename A<%=j%><%}%>> void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple, A<%=j%><%}%>>& v); <%}%> diff --git a/include/msgpack/adaptor/bool.hpp b/include/msgpack/adaptor/bool.hpp index df7e7ac7..58c96cc9 100644 --- a/include/msgpack/adaptor/bool.hpp +++ b/include/msgpack/adaptor/bool.hpp @@ -26,9 +26,9 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { -inline object const& operator>> (object const& o, bool& v) +inline msgpack::object const& operator>> (msgpack::object const& o, bool& v) { - if(o.type != type::BOOLEAN) { throw type_error(); } + if(o.type != msgpack::type::BOOLEAN) { throw type_error(); } v = o.via.boolean; return o; } @@ -41,14 +41,14 @@ inline packer& operator<< (packer& o, const bool& v) return o; } -inline void operator<< (object& o, bool v) +inline void operator<< (msgpack::object& o, bool v) { - o.type = type::BOOLEAN; + o.type = msgpack::type::BOOLEAN; o.via.boolean = v; } -inline void operator<< (object::with_zone& o, bool v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, bool v) + { static_cast(o) << v; } } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/bool_fwd.hpp b/include/msgpack/adaptor/bool_fwd.hpp index aecde517..d57cebac 100644 --- a/include/msgpack/adaptor/bool_fwd.hpp +++ b/include/msgpack/adaptor/bool_fwd.hpp @@ -25,11 +25,11 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { -object const& operator>> (object const& o, bool& v); +msgpack::object const& operator>> (msgpack::object const& o, bool& v); template packer& operator<< (packer& o, const bool& v); -void operator<< (object& o, bool v); -void operator<< (object::with_zone& o, bool v); +void operator<< (msgpack::object& o, bool v); +void operator<< (msgpack::object::with_zone& o, bool v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/char_ptr.hpp b/include/msgpack/adaptor/char_ptr.hpp index dca1acff..03f08141 100644 --- a/include/msgpack/adaptor/char_ptr.hpp +++ b/include/msgpack/adaptor/char_ptr.hpp @@ -35,20 +35,20 @@ inline packer& operator<< (packer& o, const char* v) return o; } -inline void operator<< (object::with_zone& o, const char* v) +inline void operator<< (msgpack::object::with_zone& o, const char* v) { std::size_t size = std::strlen(v); - o.type = type::STR; + o.type = msgpack::type::STR; char* ptr = static_cast(o.zone.allocate_align(size)); o.via.str.ptr = ptr; o.via.str.size = static_cast(size); memcpy(ptr, v, size); } -inline void operator<< (object& o, const char* v) +inline void operator<< (msgpack::object& o, const char* v) { std::size_t size = std::strlen(v); - o.type = type::STR; + o.type = msgpack::type::STR; o.via.str.ptr = v; o.via.str.size = static_cast(size); } diff --git a/include/msgpack/adaptor/char_ptr_fwd.hpp b/include/msgpack/adaptor/char_ptr_fwd.hpp index f6290e6a..3a8a8d58 100644 --- a/include/msgpack/adaptor/char_ptr_fwd.hpp +++ b/include/msgpack/adaptor/char_ptr_fwd.hpp @@ -28,8 +28,8 @@ MSGPACK_API_VERSION_NAMESPACE(v1) { template packer& operator<< (packer& o, const char* v); -void operator<< (object::with_zone& o, const char* v); -void operator<< (object& o, const char* v); +void operator<< (msgpack::object::with_zone& o, const char* v); +void operator<< (msgpack::object& o, const char* v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/cpp11/array.hpp b/include/msgpack/adaptor/cpp11/array.hpp index 6c932adf..546da4af 100644 --- a/include/msgpack/adaptor/cpp11/array.hpp +++ b/include/msgpack/adaptor/cpp11/array.hpp @@ -29,12 +29,12 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -inline object const& operator>> (object const& o, std::array& v) { - if(o.type != type::ARRAY) { throw type_error(); } +inline msgpack::object const& operator>> (msgpack::object const& o, std::array& v) { + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size != N) { throw type_error(); } if(o.via.array.size > 0) { - object* p = o.via.array.ptr; - object* const pend = o.via.array.ptr + o.via.array.size; + msgpack::object* p = o.via.array.ptr; + msgpack::object* const pend = o.via.array.ptr + o.via.array.size; T* it = &v[0]; do { p->convert(*it); @@ -53,16 +53,16 @@ inline packer& operator<< (packer& o, const std::array& v) } template -inline void operator<< (object::with_zone& o, const std::array& v) { - o.type = type::ARRAY; +inline void operator<< (msgpack::object::with_zone& o, const std::array& v) { + o.type = msgpack::type::ARRAY; if(v.empty()) { o.via.array.ptr = nullptr; o.via.array.size = 0; } else { - object* p = static_cast(o.zone.allocate_align(sizeof(object)*v.size())); + msgpack::object* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*v.size())); o.via.array.size = v.size(); o.via.array.ptr = p; - for (auto const& e : v) *p++ = object(e, o.zone); + for (auto const& e : v) *p++ = msgpack::object(e, o.zone); } } diff --git a/include/msgpack/adaptor/cpp11/array_char.hpp b/include/msgpack/adaptor/cpp11/array_char.hpp index 9df71bb1..7977d7b4 100644 --- a/include/msgpack/adaptor/cpp11/array_char.hpp +++ b/include/msgpack/adaptor/cpp11/array_char.hpp @@ -27,14 +27,14 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -inline object const& operator>> (object const& o, std::array& v) +inline msgpack::object const& operator>> (msgpack::object const& o, std::array& v) { switch (o.type) { - case type::BIN: + case msgpack::type::BIN: if(o.via.bin.size != N) { throw type_error(); } std::memcpy(v.data(), o.via.bin.ptr, o.via.bin.size); break; - case type::STR: + case msgpack::type::STR: if(o.via.str.size != N) { throw type_error(); } std::memcpy(v.data(), o.via.str.ptr, N); break; @@ -55,17 +55,17 @@ inline packer& operator<< (packer& o, const std::array& } template -inline void operator<< (object& o, const std::array& v) +inline void operator<< (msgpack::object& o, const std::array& v) { - o.type = type::BIN; + o.type = msgpack::type::BIN; o.via.bin.ptr = v.data(); o.via.bin.size = static_cast(v.size()); } template -inline void operator<< (object::with_zone& o, const std::array& v) +inline void operator<< (msgpack::object::with_zone& o, const std::array& v) { - o.type = type::BIN; + o.type = msgpack::type::BIN; char* ptr = static_cast(o.zone.allocate_align(v.size())); o.via.bin.ptr = ptr; o.via.bin.size = static_cast(v.size()); diff --git a/include/msgpack/adaptor/cpp11/array_char_fwd.hpp b/include/msgpack/adaptor/cpp11/array_char_fwd.hpp index 5f64e522..669f5cfc 100644 --- a/include/msgpack/adaptor/cpp11/array_char_fwd.hpp +++ b/include/msgpack/adaptor/cpp11/array_char_fwd.hpp @@ -27,16 +27,16 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -object const& operator>> (object const& o, std::array& v); +msgpack::object const& operator>> (msgpack::object const& o, std::array& v); template packer& operator<< (packer& o, const std::array& v); template -void operator<< (object& o, const std::array& v); +void operator<< (msgpack::object& o, const std::array& v); template -void operator<< (object::with_zone& o, const std::array& v); +void operator<< (msgpack::object::with_zone& o, const std::array& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/cpp11/array_fwd.hpp b/include/msgpack/adaptor/cpp11/array_fwd.hpp index 815694b4..579c0702 100644 --- a/include/msgpack/adaptor/cpp11/array_fwd.hpp +++ b/include/msgpack/adaptor/cpp11/array_fwd.hpp @@ -29,13 +29,13 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -object const& operator>> (object const& o, std::array& v); +msgpack::object const& operator>> (msgpack::object const& o, std::array& v); template packer& operator<< (packer& o, const std::array& v); template -void operator<< (object::with_zone& o, const std::array& v); +void operator<< (msgpack::object::with_zone& o, const std::array& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/cpp11/forward_list.hpp b/include/msgpack/adaptor/cpp11/forward_list.hpp index dd78afd6..99d3fe95 100644 --- a/include/msgpack/adaptor/cpp11/forward_list.hpp +++ b/include/msgpack/adaptor/cpp11/forward_list.hpp @@ -29,11 +29,11 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -inline object const& operator>> (object const& o, std::forward_list& v) +inline msgpack::object const& operator>> (msgpack::object const& o, std::forward_list& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } v.resize(o.via.array.size); - object* p = o.via.array.ptr; + msgpack::object* p = o.via.array.ptr; for (auto &e : v) { p->convert(e); ++p; @@ -50,19 +50,19 @@ inline packer& operator<< (packer& o, const std::forward_list } template -inline void operator<< (object::with_zone& o, const std::forward_list& v) +inline void operator<< (msgpack::object::with_zone& o, const std::forward_list& v) { - o.type = type::ARRAY; + o.type = msgpack::type::ARRAY; if(v.empty()) { o.via.array.ptr = nullptr; o.via.array.size = 0; } else { std::size_t size = std::distance(v.begin(), v.end()); o.via.array.size = size; - object* p = static_cast( - o.zone.allocate_align(sizeof(object)*size)); + msgpack::object* p = static_cast( + o.zone.allocate_align(sizeof(msgpack::object)*size)); o.via.array.ptr = p; - for(auto const& e : v) *p++ = object(e, o.zone); + for(auto const& e : v) *p++ = msgpack::object(e, o.zone); } } diff --git a/include/msgpack/adaptor/cpp11/forward_list_fwd.hpp b/include/msgpack/adaptor/cpp11/forward_list_fwd.hpp index 47ca34a2..cebf7b43 100644 --- a/include/msgpack/adaptor/cpp11/forward_list_fwd.hpp +++ b/include/msgpack/adaptor/cpp11/forward_list_fwd.hpp @@ -29,13 +29,13 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -object const& operator>> (object const& o, std::forward_list& v); +msgpack::object const& operator>> (msgpack::object const& o, std::forward_list& v); template packer& operator<< (packer& o, const std::forward_list& v); template -void operator<< (object::with_zone& o, const std::forward_list& v); +void operator<< (msgpack::object::with_zone& o, const std::forward_list& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/cpp11/tuple.hpp b/include/msgpack/adaptor/cpp11/tuple.hpp index b917360a..79c58e59 100644 --- a/include/msgpack/adaptor/cpp11/tuple.hpp +++ b/include/msgpack/adaptor/cpp11/tuple.hpp @@ -70,7 +70,7 @@ inline const packer& operator<< ( template struct StdTupleConverter { static void convert( - object const& o, + msgpack::object const& o, Tuple& v) { StdTupleConverter::convert(o, v); o.via.array.ptr[N-1].convert(v))>::type>(std::get(v)); @@ -80,7 +80,7 @@ struct StdTupleConverter { template struct StdTupleConverter { static void convert ( - object const& o, + msgpack::object const& o, Tuple& v) { o.via.array.ptr[0].convert(v))>::type>(std::get<0>(v)); } @@ -89,16 +89,16 @@ struct StdTupleConverter { template struct StdTupleConverter { static void convert ( - object const&, + msgpack::object const&, Tuple&) { } }; template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, std::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < sizeof...(Args)) { throw type_error(); } StdTupleConverter::convert(o, v); return o; @@ -108,36 +108,36 @@ inline object const& operator>> ( template struct StdTupleToObjectWithZone { static void convert( - object::with_zone& o, + msgpack::object::with_zone& o, const Tuple& v) { StdTupleToObjectWithZone::convert(o, v); - o.via.array.ptr[N-1] = object(std::get(v), o.zone); + o.via.array.ptr[N-1] = msgpack::object(std::get(v), o.zone); } }; template struct StdTupleToObjectWithZone { static void convert ( - object::with_zone& o, + msgpack::object::with_zone& o, const Tuple& v) { - o.via.array.ptr[0] = object(std::get<0>(v), o.zone); + o.via.array.ptr[0] = msgpack::object(std::get<0>(v), o.zone); } }; template struct StdTupleToObjectWithZone { static void convert ( - object::with_zone&, + msgpack::object::with_zone&, const Tuple&) { } }; template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, std::tuple const& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*sizeof...(Args))); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*sizeof...(Args))); o.via.array.size = sizeof...(Args); StdTupleToObjectWithZone::convert(o, v); } diff --git a/include/msgpack/adaptor/cpp11/tuple_fwd.hpp b/include/msgpack/adaptor/cpp11/tuple_fwd.hpp index f17ac289..020f8094 100644 --- a/include/msgpack/adaptor/cpp11/tuple_fwd.hpp +++ b/include/msgpack/adaptor/cpp11/tuple_fwd.hpp @@ -42,8 +42,8 @@ template struct StdTupleConverter; template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, std::tuple& v); // --- Convert from tuple to object with zone --- @@ -52,7 +52,7 @@ struct StdTupleToObjectWithZone; template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, std::tuple const& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/cpp11/unordered_map.hpp b/include/msgpack/adaptor/cpp11/unordered_map.hpp index 6d31cf86..a6efca0a 100644 --- a/include/msgpack/adaptor/cpp11/unordered_map.hpp +++ b/include/msgpack/adaptor/cpp11/unordered_map.hpp @@ -28,11 +28,11 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -inline object const& operator>> (object const& o, std::unordered_map& v) +inline msgpack::object const& operator>> (msgpack::object const& o, std::unordered_map& v) { - if(o.type != type::MAP) { throw type_error(); } - object_kv* p(o.via.map.ptr); - object_kv* const pend(o.via.map.ptr + o.via.map.size); + if(o.type != msgpack::type::MAP) { throw type_error(); } + msgpack::object_kv* p(o.via.map.ptr); + msgpack::object_kv* const pend(o.via.map.ptr + o.via.map.size); std::unordered_map tmp; for(; p != pend; ++p) { K key; @@ -56,21 +56,21 @@ inline packer& operator<< (packer& o, const std::unordered_map -inline void operator<< (object::with_zone& o, const std::unordered_map& v) +inline void operator<< (msgpack::object::with_zone& o, const std::unordered_map& v) { - o.type = type::MAP; + o.type = msgpack::type::MAP; if(v.empty()) { o.via.map.ptr = nullptr; o.via.map.size = 0; } else { - object_kv* p = static_cast(o.zone.allocate_align(sizeof(object_kv)*v.size())); - object_kv* const pend = p + v.size(); + msgpack::object_kv* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object_kv)*v.size())); + msgpack::object_kv* const pend = p + v.size(); o.via.map.ptr = p; o.via.map.size = v.size(); typename std::unordered_map::const_iterator it(v.begin()); do { - p->key = object(it->first, o.zone); - p->val = object(it->second, o.zone); + p->key = msgpack::object(it->first, o.zone); + p->val = msgpack::object(it->second, o.zone); ++p; ++it; } while(p < pend); @@ -79,11 +79,11 @@ inline void operator<< (object::with_zone& o, const std::unordered_map& v) template -inline object const& operator>> (object const& o, std::unordered_multimap& v) +inline msgpack::object const& operator>> (msgpack::object const& o, std::unordered_multimap& v) { - if(o.type != type::MAP) { throw type_error(); } - object_kv* p(o.via.map.ptr); - object_kv* const pend(o.via.map.ptr + o.via.map.size); + if(o.type != msgpack::type::MAP) { throw type_error(); } + msgpack::object_kv* p(o.via.map.ptr); + msgpack::object_kv* const pend(o.via.map.ptr + o.via.map.size); std::unordered_multimap tmp; for(; p != pend; ++p) { std::pair value; @@ -108,21 +108,21 @@ inline packer& operator<< (packer& o, const std::unordered_multi } template -inline void operator<< (object::with_zone& o, const std::unordered_multimap& v) +inline void operator<< (msgpack::object::with_zone& o, const std::unordered_multimap& v) { - o.type = type::MAP; + o.type = msgpack::type::MAP; if(v.empty()) { o.via.map.ptr = nullptr; o.via.map.size = 0; } else { - object_kv* p = static_cast(o.zone.allocate_align(sizeof(object_kv)*v.size())); - object_kv* const pend = p + v.size(); + msgpack::object_kv* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object_kv)*v.size())); + msgpack::object_kv* const pend = p + v.size(); o.via.map.ptr = p; o.via.map.size = v.size(); typename std::unordered_multimap::const_iterator it(v.begin()); do { - p->key = object(it->first, o.zone); - p->val = object(it->second, o.zone); + p->key = msgpack::object(it->first, o.zone); + p->val = msgpack::object(it->second, o.zone); ++p; ++it; } while(p < pend); diff --git a/include/msgpack/adaptor/cpp11/unordered_map_fwd.hpp b/include/msgpack/adaptor/cpp11/unordered_map_fwd.hpp index b6c66696..1e016123 100644 --- a/include/msgpack/adaptor/cpp11/unordered_map_fwd.hpp +++ b/include/msgpack/adaptor/cpp11/unordered_map_fwd.hpp @@ -28,22 +28,22 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -object const& operator>> (object const& o, std::unordered_map& v); +msgpack::object const& operator>> (msgpack::object const& o, std::unordered_map& v); template packer& operator<< (packer& o, const std::unordered_map& v); template -void operator<< (object::with_zone& o, const std::unordered_map& v); +void operator<< (msgpack::object::with_zone& o, const std::unordered_map& v); template -object const& operator>> (object const& o, std::unordered_multimap& v); +msgpack::object const& operator>> (msgpack::object const& o, std::unordered_multimap& v); template packer& operator<< (packer& o, const std::unordered_multimap& v); template -void operator<< (object::with_zone& o, const std::unordered_multimap& v); +void operator<< (msgpack::object::with_zone& o, const std::unordered_multimap& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/cpp11/unordered_set.hpp b/include/msgpack/adaptor/cpp11/unordered_set.hpp index fe8eb3b1..9bba97df 100644 --- a/include/msgpack/adaptor/cpp11/unordered_set.hpp +++ b/include/msgpack/adaptor/cpp11/unordered_set.hpp @@ -28,11 +28,11 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -inline object const& operator>> (object const& o, std::unordered_set& v) +inline msgpack::object const& operator>> (msgpack::object const& o, std::unordered_set& v) { - if(o.type != type::ARRAY) { throw type_error(); } - object* p = o.via.array.ptr + o.via.array.size; - object* const pbegin = o.via.array.ptr; + if(o.type != msgpack::type::ARRAY) { throw type_error(); } + msgpack::object* p = o.via.array.ptr + o.via.array.size; + msgpack::object* const pbegin = o.via.array.ptr; std::unordered_set tmp; while(p > pbegin) { --p; @@ -54,20 +54,20 @@ inline packer& operator<< (packer& o, const std::unordered_set -inline void operator<< (object::with_zone& o, const std::unordered_set& v) +inline void operator<< (msgpack::object::with_zone& o, const std::unordered_set& v) { - o.type = type::ARRAY; + o.type = msgpack::type::ARRAY; if(v.empty()) { o.via.array.ptr = nullptr; o.via.array.size = 0; } else { - object* p = static_cast(o.zone.allocate_align(sizeof(object)*v.size())); - object* const pend = p + v.size(); + msgpack::object* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*v.size())); + msgpack::object* const pend = p + v.size(); o.via.array.ptr = p; o.via.array.size = v.size(); typename std::unordered_set::const_iterator it(v.begin()); do { - *p = object(*it, o.zone); + *p = msgpack::object(*it, o.zone); ++p; ++it; } while(p < pend); @@ -76,11 +76,11 @@ inline void operator<< (object::with_zone& o, const std::unordered_set& v) template -inline object const& operator>> (object const& o, std::unordered_multiset& v) +inline msgpack::object const& operator>> (msgpack::object const& o, std::unordered_multiset& v) { - if(o.type != type::ARRAY) { throw type_error(); } - object* p = o.via.array.ptr + o.via.array.size; - object* const pbegin = o.via.array.ptr; + if(o.type != msgpack::type::ARRAY) { throw type_error(); } + msgpack::object* p = o.via.array.ptr + o.via.array.size; + msgpack::object* const pbegin = o.via.array.ptr; std::unordered_multiset tmp; while(p > pbegin) { --p; @@ -102,20 +102,20 @@ inline packer& operator<< (packer& o, const std::unordered_multi } template -inline void operator<< (object::with_zone& o, const std::unordered_multiset& v) +inline void operator<< (msgpack::object::with_zone& o, const std::unordered_multiset& v) { - o.type = type::ARRAY; + o.type = msgpack::type::ARRAY; if(v.empty()) { o.via.array.ptr = nullptr; o.via.array.size = 0; } else { - object* p = static_cast(o.zone.allocate_align(sizeof(object)*v.size())); - object* const pend = p + v.size(); + msgpack::object* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*v.size())); + msgpack::object* const pend = p + v.size(); o.via.array.ptr = p; o.via.array.size = v.size(); typename std::unordered_multiset::const_iterator it(v.begin()); do { - *p = object(*it, o.zone); + *p = msgpack::object(*it, o.zone); ++p; ++it; } while(p < pend); diff --git a/include/msgpack/adaptor/cpp11/unordered_set_fwd.hpp b/include/msgpack/adaptor/cpp11/unordered_set_fwd.hpp index 7e03b5e0..26e82a97 100644 --- a/include/msgpack/adaptor/cpp11/unordered_set_fwd.hpp +++ b/include/msgpack/adaptor/cpp11/unordered_set_fwd.hpp @@ -28,22 +28,22 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -object const& operator>> (object const& o, std::unordered_set& v); +msgpack::object const& operator>> (msgpack::object const& o, std::unordered_set& v); template packer& operator<< (packer& o, const std::unordered_set& v); template -void operator<< (object::with_zone& o, const std::unordered_set& v); +void operator<< (msgpack::object::with_zone& o, const std::unordered_set& v); template -object const& operator>> (object const& o, std::unordered_multiset& v); +msgpack::object const& operator>> (msgpack::object const& o, std::unordered_multiset& v); template packer& operator<< (packer& o, const std::unordered_multiset& v); template -void operator<< (object::with_zone& o, const std::unordered_multiset& v); +void operator<< (msgpack::object::with_zone& o, const std::unordered_multiset& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/deque.hpp b/include/msgpack/adaptor/deque.hpp index 94bac923..2e6f5464 100644 --- a/include/msgpack/adaptor/deque.hpp +++ b/include/msgpack/adaptor/deque.hpp @@ -27,12 +27,12 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -inline object const& operator>> (object const& o, std::deque& v) +inline msgpack::object const& operator>> (msgpack::object const& o, std::deque& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } v.resize(o.via.array.size); - object* p = o.via.array.ptr; - object* const pend = o.via.array.ptr + o.via.array.size; + msgpack::object* p = o.via.array.ptr; + msgpack::object* const pend = o.via.array.ptr + o.via.array.size; typename std::deque::iterator it = v.begin(); for(; p < pend; ++p, ++it) { p->convert(*it); @@ -52,20 +52,20 @@ inline packer& operator<< (packer& o, const std::deque& v) } template -inline void operator<< (object::with_zone& o, const std::deque& v) +inline void operator<< (msgpack::object::with_zone& o, const std::deque& v) { - o.type = type::ARRAY; + o.type = msgpack::type::ARRAY; if(v.empty()) { o.via.array.ptr = nullptr; o.via.array.size = 0; } else { - object* p = static_cast(o.zone.allocate_align(sizeof(object)*v.size())); - object* const pend = p + v.size(); + msgpack::object* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*v.size())); + msgpack::object* const pend = p + v.size(); o.via.array.ptr = p; o.via.array.size = v.size(); typename std::deque::const_iterator it(v.begin()); do { - *p = object(*it, o.zone); + *p = msgpack::object(*it, o.zone); ++p; ++it; } while(p < pend); diff --git a/include/msgpack/adaptor/deque_fwd.hpp b/include/msgpack/adaptor/deque_fwd.hpp index 81a88189..651869df 100644 --- a/include/msgpack/adaptor/deque_fwd.hpp +++ b/include/msgpack/adaptor/deque_fwd.hpp @@ -27,11 +27,11 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -object const& operator>> (object const& o, std::deque& v); +msgpack::object const& operator>> (msgpack::object const& o, std::deque& v); template packer& operator<< (packer& o, const std::deque& v); template -void operator<< (object::with_zone& o, const std::deque& v); +void operator<< (msgpack::object::with_zone& o, const std::deque& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/detail/cpp03_define.hpp b/include/msgpack/adaptor/detail/cpp03_define.hpp index 5fa6f4d4..183ac104 100644 --- a/include/msgpack/adaptor/detail/cpp03_define.hpp +++ b/include/msgpack/adaptor/detail/cpp03_define.hpp @@ -43,18 +43,18 @@ #define MSGPACK_ADD_ENUM(enum) \ namespace msgpack { \ MSGPACK_API_VERSION_NAMESPACE(v1) { \ - inline object const& operator>> (object const& o, enum& v) \ + inline msgpack::object const& operator>> (msgpack::object const& o, enum& v) \ { \ int tmp; \ o >> tmp; \ v = static_cast(tmp); \ return o; \ } \ - inline void operator<< (object& o, const enum& v) \ + inline void operator<< (msgpack::object& o, const enum& v) \ { \ o << static_cast(v); \ } \ - inline void operator<< (object::with_zone& o, const enum& v) \ + inline void operator<< (msgpack::object::with_zone& o, const enum& v) \ { \ o << static_cast(v); \ } \ @@ -90,11 +90,11 @@ struct define<> { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } } void msgpack_object(msgpack::object* o, msgpack::zone&) const { - o->type = type::ARRAY; + o->type = msgpack::type::ARRAY; o->via.array.ptr = nullptr; o->via.array.size = 0; } @@ -115,7 +115,7 @@ struct define { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } const size_t size = o.via.array.size; if(size > 0) { msgpack::object *ptr = o.via.array.ptr; @@ -127,11 +127,11 @@ struct define { } void msgpack_object(msgpack::object* o, msgpack::zone& z) const { - o->type = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*1)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*1)); o->via.array.size = 1; - o->via.array.ptr[0] = object(a0, z); + o->via.array.ptr[0] = msgpack::object(a0, z); } A0& a0; @@ -153,7 +153,7 @@ struct define { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } const size_t size = o.via.array.size; if(size > 0) { msgpack::object *ptr = o.via.array.ptr; @@ -166,12 +166,12 @@ struct define { } void msgpack_object(msgpack::object* o, msgpack::zone& z) const { - o->type = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*2)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*2)); o->via.array.size = 2; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); } A0& a0; @@ -195,7 +195,7 @@ struct define { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } const size_t size = o.via.array.size; if(size > 0) { msgpack::object *ptr = o.via.array.ptr; @@ -209,13 +209,13 @@ struct define { } void msgpack_object(msgpack::object* o, msgpack::zone& z) const { - o->type = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*3)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*3)); o->via.array.size = 3; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); } A0& a0; @@ -241,7 +241,7 @@ struct define { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } const size_t size = o.via.array.size; if(size > 0) { msgpack::object *ptr = o.via.array.ptr; @@ -256,14 +256,14 @@ struct define { } void msgpack_object(msgpack::object* o, msgpack::zone& z) const { - o->type = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*4)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*4)); o->via.array.size = 4; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); } A0& a0; @@ -291,7 +291,7 @@ struct define { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } const size_t size = o.via.array.size; if(size > 0) { msgpack::object *ptr = o.via.array.ptr; @@ -307,15 +307,15 @@ struct define { } void msgpack_object(msgpack::object* o, msgpack::zone& z) const { - o->type = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*5)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*5)); o->via.array.size = 5; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); } A0& a0; @@ -345,7 +345,7 @@ struct define { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } const size_t size = o.via.array.size; if(size > 0) { msgpack::object *ptr = o.via.array.ptr; @@ -362,16 +362,16 @@ struct define { } void msgpack_object(msgpack::object* o, msgpack::zone& z) const { - o->type = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*6)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*6)); o->via.array.size = 6; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); } A0& a0; @@ -403,7 +403,7 @@ struct define { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } const size_t size = o.via.array.size; if(size > 0) { msgpack::object *ptr = o.via.array.ptr; @@ -421,17 +421,17 @@ struct define { } void msgpack_object(msgpack::object* o, msgpack::zone& z) const { - o->type = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*7)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*7)); o->via.array.size = 7; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); } A0& a0; @@ -465,7 +465,7 @@ struct define { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } const size_t size = o.via.array.size; if(size > 0) { msgpack::object *ptr = o.via.array.ptr; @@ -484,18 +484,18 @@ struct define { } void msgpack_object(msgpack::object* o, msgpack::zone& z) const { - o->type = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*8)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*8)); o->via.array.size = 8; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); } A0& a0; @@ -531,7 +531,7 @@ struct define { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } const size_t size = o.via.array.size; if(size > 0) { msgpack::object *ptr = o.via.array.ptr; @@ -551,19 +551,19 @@ struct define { } void msgpack_object(msgpack::object* o, msgpack::zone& z) const { - o->type = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*9)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*9)); o->via.array.size = 9; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); } A0& a0; @@ -601,7 +601,7 @@ struct define { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } const size_t size = o.via.array.size; if(size > 0) { msgpack::object *ptr = o.via.array.ptr; @@ -622,20 +622,20 @@ struct define { } void msgpack_object(msgpack::object* o, msgpack::zone& z) const { - o->type = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*10)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*10)); o->via.array.size = 10; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); } A0& a0; @@ -675,7 +675,7 @@ struct define { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } const size_t size = o.via.array.size; if(size > 0) { msgpack::object *ptr = o.via.array.ptr; @@ -697,21 +697,21 @@ struct define { } void msgpack_object(msgpack::object* o, msgpack::zone& z) const { - o->type = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*11)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*11)); o->via.array.size = 11; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); } A0& a0; @@ -753,7 +753,7 @@ struct define { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } const size_t size = o.via.array.size; if(size > 0) { msgpack::object *ptr = o.via.array.ptr; @@ -776,22 +776,22 @@ struct define { } void msgpack_object(msgpack::object* o, msgpack::zone& z) const { - o->type = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*12)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*12)); o->via.array.size = 12; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); } A0& a0; @@ -835,7 +835,7 @@ struct define { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } const size_t size = o.via.array.size; if(size > 0) { msgpack::object *ptr = o.via.array.ptr; @@ -859,23 +859,23 @@ struct define { } void msgpack_object(msgpack::object* o, msgpack::zone& z) const { - o->type = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*13)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*13)); o->via.array.size = 13; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); } A0& a0; @@ -921,7 +921,7 @@ struct define { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } const size_t size = o.via.array.size; if(size > 0) { msgpack::object *ptr = o.via.array.ptr; @@ -946,24 +946,24 @@ struct define { } void msgpack_object(msgpack::object* o, msgpack::zone& z) const { - o->type = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*14)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*14)); o->via.array.size = 14; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); } A0& a0; @@ -1011,7 +1011,7 @@ struct define { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } const size_t size = o.via.array.size; if(size > 0) { msgpack::object *ptr = o.via.array.ptr; @@ -1037,25 +1037,25 @@ struct define { } void msgpack_object(msgpack::object* o, msgpack::zone& z) const { - o->type = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*15)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*15)); o->via.array.size = 15; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); } A0& a0; @@ -1105,7 +1105,7 @@ struct define 0) { msgpack::object *ptr = o.via.array.ptr; @@ -1132,26 +1132,26 @@ struct definetype = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*16)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*16)); o->via.array.size = 16; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); - o->via.array.ptr[15] = object(a15, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); + o->via.array.ptr[15] = msgpack::object(a15, z); } A0& a0; @@ -1203,7 +1203,7 @@ struct define 0) { msgpack::object *ptr = o.via.array.ptr; @@ -1231,27 +1231,27 @@ struct definetype = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*17)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*17)); o->via.array.size = 17; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); - o->via.array.ptr[15] = object(a15, z); - o->via.array.ptr[16] = object(a16, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); + o->via.array.ptr[15] = msgpack::object(a15, z); + o->via.array.ptr[16] = msgpack::object(a16, z); } A0& a0; @@ -1305,7 +1305,7 @@ struct define 0) { msgpack::object *ptr = o.via.array.ptr; @@ -1334,28 +1334,28 @@ struct definetype = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*18)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*18)); o->via.array.size = 18; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); - o->via.array.ptr[15] = object(a15, z); - o->via.array.ptr[16] = object(a16, z); - o->via.array.ptr[17] = object(a17, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); + o->via.array.ptr[15] = msgpack::object(a15, z); + o->via.array.ptr[16] = msgpack::object(a16, z); + o->via.array.ptr[17] = msgpack::object(a17, z); } A0& a0; @@ -1411,7 +1411,7 @@ struct define 0) { msgpack::object *ptr = o.via.array.ptr; @@ -1441,29 +1441,29 @@ struct definetype = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*19)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*19)); o->via.array.size = 19; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); - o->via.array.ptr[15] = object(a15, z); - o->via.array.ptr[16] = object(a16, z); - o->via.array.ptr[17] = object(a17, z); - o->via.array.ptr[18] = object(a18, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); + o->via.array.ptr[15] = msgpack::object(a15, z); + o->via.array.ptr[16] = msgpack::object(a16, z); + o->via.array.ptr[17] = msgpack::object(a17, z); + o->via.array.ptr[18] = msgpack::object(a18, z); } A0& a0; @@ -1521,7 +1521,7 @@ struct define 0) { msgpack::object *ptr = o.via.array.ptr; @@ -1552,30 +1552,30 @@ struct definetype = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*20)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*20)); o->via.array.size = 20; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); - o->via.array.ptr[15] = object(a15, z); - o->via.array.ptr[16] = object(a16, z); - o->via.array.ptr[17] = object(a17, z); - o->via.array.ptr[18] = object(a18, z); - o->via.array.ptr[19] = object(a19, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); + o->via.array.ptr[15] = msgpack::object(a15, z); + o->via.array.ptr[16] = msgpack::object(a16, z); + o->via.array.ptr[17] = msgpack::object(a17, z); + o->via.array.ptr[18] = msgpack::object(a18, z); + o->via.array.ptr[19] = msgpack::object(a19, z); } A0& a0; @@ -1635,7 +1635,7 @@ struct define 0) { msgpack::object *ptr = o.via.array.ptr; @@ -1667,31 +1667,31 @@ struct definetype = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*21)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*21)); o->via.array.size = 21; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); - o->via.array.ptr[15] = object(a15, z); - o->via.array.ptr[16] = object(a16, z); - o->via.array.ptr[17] = object(a17, z); - o->via.array.ptr[18] = object(a18, z); - o->via.array.ptr[19] = object(a19, z); - o->via.array.ptr[20] = object(a20, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); + o->via.array.ptr[15] = msgpack::object(a15, z); + o->via.array.ptr[16] = msgpack::object(a16, z); + o->via.array.ptr[17] = msgpack::object(a17, z); + o->via.array.ptr[18] = msgpack::object(a18, z); + o->via.array.ptr[19] = msgpack::object(a19, z); + o->via.array.ptr[20] = msgpack::object(a20, z); } A0& a0; @@ -1753,7 +1753,7 @@ struct define 0) { msgpack::object *ptr = o.via.array.ptr; @@ -1786,32 +1786,32 @@ struct definetype = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*22)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*22)); o->via.array.size = 22; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); - o->via.array.ptr[15] = object(a15, z); - o->via.array.ptr[16] = object(a16, z); - o->via.array.ptr[17] = object(a17, z); - o->via.array.ptr[18] = object(a18, z); - o->via.array.ptr[19] = object(a19, z); - o->via.array.ptr[20] = object(a20, z); - o->via.array.ptr[21] = object(a21, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); + o->via.array.ptr[15] = msgpack::object(a15, z); + o->via.array.ptr[16] = msgpack::object(a16, z); + o->via.array.ptr[17] = msgpack::object(a17, z); + o->via.array.ptr[18] = msgpack::object(a18, z); + o->via.array.ptr[19] = msgpack::object(a19, z); + o->via.array.ptr[20] = msgpack::object(a20, z); + o->via.array.ptr[21] = msgpack::object(a21, z); } A0& a0; @@ -1875,7 +1875,7 @@ struct define 0) { msgpack::object *ptr = o.via.array.ptr; @@ -1909,33 +1909,33 @@ struct definetype = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*23)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*23)); o->via.array.size = 23; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); - o->via.array.ptr[15] = object(a15, z); - o->via.array.ptr[16] = object(a16, z); - o->via.array.ptr[17] = object(a17, z); - o->via.array.ptr[18] = object(a18, z); - o->via.array.ptr[19] = object(a19, z); - o->via.array.ptr[20] = object(a20, z); - o->via.array.ptr[21] = object(a21, z); - o->via.array.ptr[22] = object(a22, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); + o->via.array.ptr[15] = msgpack::object(a15, z); + o->via.array.ptr[16] = msgpack::object(a16, z); + o->via.array.ptr[17] = msgpack::object(a17, z); + o->via.array.ptr[18] = msgpack::object(a18, z); + o->via.array.ptr[19] = msgpack::object(a19, z); + o->via.array.ptr[20] = msgpack::object(a20, z); + o->via.array.ptr[21] = msgpack::object(a21, z); + o->via.array.ptr[22] = msgpack::object(a22, z); } A0& a0; @@ -2001,7 +2001,7 @@ struct define 0) { msgpack::object *ptr = o.via.array.ptr; @@ -2036,34 +2036,34 @@ struct definetype = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*24)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*24)); o->via.array.size = 24; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); - o->via.array.ptr[15] = object(a15, z); - o->via.array.ptr[16] = object(a16, z); - o->via.array.ptr[17] = object(a17, z); - o->via.array.ptr[18] = object(a18, z); - o->via.array.ptr[19] = object(a19, z); - o->via.array.ptr[20] = object(a20, z); - o->via.array.ptr[21] = object(a21, z); - o->via.array.ptr[22] = object(a22, z); - o->via.array.ptr[23] = object(a23, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); + o->via.array.ptr[15] = msgpack::object(a15, z); + o->via.array.ptr[16] = msgpack::object(a16, z); + o->via.array.ptr[17] = msgpack::object(a17, z); + o->via.array.ptr[18] = msgpack::object(a18, z); + o->via.array.ptr[19] = msgpack::object(a19, z); + o->via.array.ptr[20] = msgpack::object(a20, z); + o->via.array.ptr[21] = msgpack::object(a21, z); + o->via.array.ptr[22] = msgpack::object(a22, z); + o->via.array.ptr[23] = msgpack::object(a23, z); } A0& a0; @@ -2131,7 +2131,7 @@ struct define 0) { msgpack::object *ptr = o.via.array.ptr; @@ -2167,35 +2167,35 @@ struct definetype = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*25)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*25)); o->via.array.size = 25; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); - o->via.array.ptr[15] = object(a15, z); - o->via.array.ptr[16] = object(a16, z); - o->via.array.ptr[17] = object(a17, z); - o->via.array.ptr[18] = object(a18, z); - o->via.array.ptr[19] = object(a19, z); - o->via.array.ptr[20] = object(a20, z); - o->via.array.ptr[21] = object(a21, z); - o->via.array.ptr[22] = object(a22, z); - o->via.array.ptr[23] = object(a23, z); - o->via.array.ptr[24] = object(a24, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); + o->via.array.ptr[15] = msgpack::object(a15, z); + o->via.array.ptr[16] = msgpack::object(a16, z); + o->via.array.ptr[17] = msgpack::object(a17, z); + o->via.array.ptr[18] = msgpack::object(a18, z); + o->via.array.ptr[19] = msgpack::object(a19, z); + o->via.array.ptr[20] = msgpack::object(a20, z); + o->via.array.ptr[21] = msgpack::object(a21, z); + o->via.array.ptr[22] = msgpack::object(a22, z); + o->via.array.ptr[23] = msgpack::object(a23, z); + o->via.array.ptr[24] = msgpack::object(a24, z); } A0& a0; @@ -2265,7 +2265,7 @@ struct define 0) { msgpack::object *ptr = o.via.array.ptr; @@ -2302,36 +2302,36 @@ struct definetype = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*26)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*26)); o->via.array.size = 26; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); - o->via.array.ptr[15] = object(a15, z); - o->via.array.ptr[16] = object(a16, z); - o->via.array.ptr[17] = object(a17, z); - o->via.array.ptr[18] = object(a18, z); - o->via.array.ptr[19] = object(a19, z); - o->via.array.ptr[20] = object(a20, z); - o->via.array.ptr[21] = object(a21, z); - o->via.array.ptr[22] = object(a22, z); - o->via.array.ptr[23] = object(a23, z); - o->via.array.ptr[24] = object(a24, z); - o->via.array.ptr[25] = object(a25, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); + o->via.array.ptr[15] = msgpack::object(a15, z); + o->via.array.ptr[16] = msgpack::object(a16, z); + o->via.array.ptr[17] = msgpack::object(a17, z); + o->via.array.ptr[18] = msgpack::object(a18, z); + o->via.array.ptr[19] = msgpack::object(a19, z); + o->via.array.ptr[20] = msgpack::object(a20, z); + o->via.array.ptr[21] = msgpack::object(a21, z); + o->via.array.ptr[22] = msgpack::object(a22, z); + o->via.array.ptr[23] = msgpack::object(a23, z); + o->via.array.ptr[24] = msgpack::object(a24, z); + o->via.array.ptr[25] = msgpack::object(a25, z); } A0& a0; @@ -2403,7 +2403,7 @@ struct define 0) { msgpack::object *ptr = o.via.array.ptr; @@ -2441,37 +2441,37 @@ struct definetype = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*27)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*27)); o->via.array.size = 27; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); - o->via.array.ptr[15] = object(a15, z); - o->via.array.ptr[16] = object(a16, z); - o->via.array.ptr[17] = object(a17, z); - o->via.array.ptr[18] = object(a18, z); - o->via.array.ptr[19] = object(a19, z); - o->via.array.ptr[20] = object(a20, z); - o->via.array.ptr[21] = object(a21, z); - o->via.array.ptr[22] = object(a22, z); - o->via.array.ptr[23] = object(a23, z); - o->via.array.ptr[24] = object(a24, z); - o->via.array.ptr[25] = object(a25, z); - o->via.array.ptr[26] = object(a26, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); + o->via.array.ptr[15] = msgpack::object(a15, z); + o->via.array.ptr[16] = msgpack::object(a16, z); + o->via.array.ptr[17] = msgpack::object(a17, z); + o->via.array.ptr[18] = msgpack::object(a18, z); + o->via.array.ptr[19] = msgpack::object(a19, z); + o->via.array.ptr[20] = msgpack::object(a20, z); + o->via.array.ptr[21] = msgpack::object(a21, z); + o->via.array.ptr[22] = msgpack::object(a22, z); + o->via.array.ptr[23] = msgpack::object(a23, z); + o->via.array.ptr[24] = msgpack::object(a24, z); + o->via.array.ptr[25] = msgpack::object(a25, z); + o->via.array.ptr[26] = msgpack::object(a26, z); } A0& a0; @@ -2545,7 +2545,7 @@ struct define 0) { msgpack::object *ptr = o.via.array.ptr; @@ -2584,38 +2584,38 @@ struct definetype = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*28)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*28)); o->via.array.size = 28; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); - o->via.array.ptr[15] = object(a15, z); - o->via.array.ptr[16] = object(a16, z); - o->via.array.ptr[17] = object(a17, z); - o->via.array.ptr[18] = object(a18, z); - o->via.array.ptr[19] = object(a19, z); - o->via.array.ptr[20] = object(a20, z); - o->via.array.ptr[21] = object(a21, z); - o->via.array.ptr[22] = object(a22, z); - o->via.array.ptr[23] = object(a23, z); - o->via.array.ptr[24] = object(a24, z); - o->via.array.ptr[25] = object(a25, z); - o->via.array.ptr[26] = object(a26, z); - o->via.array.ptr[27] = object(a27, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); + o->via.array.ptr[15] = msgpack::object(a15, z); + o->via.array.ptr[16] = msgpack::object(a16, z); + o->via.array.ptr[17] = msgpack::object(a17, z); + o->via.array.ptr[18] = msgpack::object(a18, z); + o->via.array.ptr[19] = msgpack::object(a19, z); + o->via.array.ptr[20] = msgpack::object(a20, z); + o->via.array.ptr[21] = msgpack::object(a21, z); + o->via.array.ptr[22] = msgpack::object(a22, z); + o->via.array.ptr[23] = msgpack::object(a23, z); + o->via.array.ptr[24] = msgpack::object(a24, z); + o->via.array.ptr[25] = msgpack::object(a25, z); + o->via.array.ptr[26] = msgpack::object(a26, z); + o->via.array.ptr[27] = msgpack::object(a27, z); } A0& a0; @@ -2691,7 +2691,7 @@ struct define 0) { msgpack::object *ptr = o.via.array.ptr; @@ -2731,39 +2731,39 @@ struct definetype = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*29)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*29)); o->via.array.size = 29; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); - o->via.array.ptr[15] = object(a15, z); - o->via.array.ptr[16] = object(a16, z); - o->via.array.ptr[17] = object(a17, z); - o->via.array.ptr[18] = object(a18, z); - o->via.array.ptr[19] = object(a19, z); - o->via.array.ptr[20] = object(a20, z); - o->via.array.ptr[21] = object(a21, z); - o->via.array.ptr[22] = object(a22, z); - o->via.array.ptr[23] = object(a23, z); - o->via.array.ptr[24] = object(a24, z); - o->via.array.ptr[25] = object(a25, z); - o->via.array.ptr[26] = object(a26, z); - o->via.array.ptr[27] = object(a27, z); - o->via.array.ptr[28] = object(a28, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); + o->via.array.ptr[15] = msgpack::object(a15, z); + o->via.array.ptr[16] = msgpack::object(a16, z); + o->via.array.ptr[17] = msgpack::object(a17, z); + o->via.array.ptr[18] = msgpack::object(a18, z); + o->via.array.ptr[19] = msgpack::object(a19, z); + o->via.array.ptr[20] = msgpack::object(a20, z); + o->via.array.ptr[21] = msgpack::object(a21, z); + o->via.array.ptr[22] = msgpack::object(a22, z); + o->via.array.ptr[23] = msgpack::object(a23, z); + o->via.array.ptr[24] = msgpack::object(a24, z); + o->via.array.ptr[25] = msgpack::object(a25, z); + o->via.array.ptr[26] = msgpack::object(a26, z); + o->via.array.ptr[27] = msgpack::object(a27, z); + o->via.array.ptr[28] = msgpack::object(a28, z); } A0& a0; @@ -2841,7 +2841,7 @@ struct define 0) { msgpack::object *ptr = o.via.array.ptr; @@ -2882,40 +2882,40 @@ struct definetype = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*30)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*30)); o->via.array.size = 30; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); - o->via.array.ptr[15] = object(a15, z); - o->via.array.ptr[16] = object(a16, z); - o->via.array.ptr[17] = object(a17, z); - o->via.array.ptr[18] = object(a18, z); - o->via.array.ptr[19] = object(a19, z); - o->via.array.ptr[20] = object(a20, z); - o->via.array.ptr[21] = object(a21, z); - o->via.array.ptr[22] = object(a22, z); - o->via.array.ptr[23] = object(a23, z); - o->via.array.ptr[24] = object(a24, z); - o->via.array.ptr[25] = object(a25, z); - o->via.array.ptr[26] = object(a26, z); - o->via.array.ptr[27] = object(a27, z); - o->via.array.ptr[28] = object(a28, z); - o->via.array.ptr[29] = object(a29, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); + o->via.array.ptr[15] = msgpack::object(a15, z); + o->via.array.ptr[16] = msgpack::object(a16, z); + o->via.array.ptr[17] = msgpack::object(a17, z); + o->via.array.ptr[18] = msgpack::object(a18, z); + o->via.array.ptr[19] = msgpack::object(a19, z); + o->via.array.ptr[20] = msgpack::object(a20, z); + o->via.array.ptr[21] = msgpack::object(a21, z); + o->via.array.ptr[22] = msgpack::object(a22, z); + o->via.array.ptr[23] = msgpack::object(a23, z); + o->via.array.ptr[24] = msgpack::object(a24, z); + o->via.array.ptr[25] = msgpack::object(a25, z); + o->via.array.ptr[26] = msgpack::object(a26, z); + o->via.array.ptr[27] = msgpack::object(a27, z); + o->via.array.ptr[28] = msgpack::object(a28, z); + o->via.array.ptr[29] = msgpack::object(a29, z); } A0& a0; @@ -2995,7 +2995,7 @@ struct define 0) { msgpack::object *ptr = o.via.array.ptr; @@ -3037,41 +3037,41 @@ struct definetype = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*31)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*31)); o->via.array.size = 31; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); - o->via.array.ptr[15] = object(a15, z); - o->via.array.ptr[16] = object(a16, z); - o->via.array.ptr[17] = object(a17, z); - o->via.array.ptr[18] = object(a18, z); - o->via.array.ptr[19] = object(a19, z); - o->via.array.ptr[20] = object(a20, z); - o->via.array.ptr[21] = object(a21, z); - o->via.array.ptr[22] = object(a22, z); - o->via.array.ptr[23] = object(a23, z); - o->via.array.ptr[24] = object(a24, z); - o->via.array.ptr[25] = object(a25, z); - o->via.array.ptr[26] = object(a26, z); - o->via.array.ptr[27] = object(a27, z); - o->via.array.ptr[28] = object(a28, z); - o->via.array.ptr[29] = object(a29, z); - o->via.array.ptr[30] = object(a30, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); + o->via.array.ptr[15] = msgpack::object(a15, z); + o->via.array.ptr[16] = msgpack::object(a16, z); + o->via.array.ptr[17] = msgpack::object(a17, z); + o->via.array.ptr[18] = msgpack::object(a18, z); + o->via.array.ptr[19] = msgpack::object(a19, z); + o->via.array.ptr[20] = msgpack::object(a20, z); + o->via.array.ptr[21] = msgpack::object(a21, z); + o->via.array.ptr[22] = msgpack::object(a22, z); + o->via.array.ptr[23] = msgpack::object(a23, z); + o->via.array.ptr[24] = msgpack::object(a24, z); + o->via.array.ptr[25] = msgpack::object(a25, z); + o->via.array.ptr[26] = msgpack::object(a26, z); + o->via.array.ptr[27] = msgpack::object(a27, z); + o->via.array.ptr[28] = msgpack::object(a28, z); + o->via.array.ptr[29] = msgpack::object(a29, z); + o->via.array.ptr[30] = msgpack::object(a30, z); } A0& a0; @@ -3153,7 +3153,7 @@ struct define 0) { msgpack::object *ptr = o.via.array.ptr; @@ -3196,42 +3196,42 @@ struct definetype = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*32)); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*32)); o->via.array.size = 32; - o->via.array.ptr[0] = object(a0, z); - o->via.array.ptr[1] = object(a1, z); - o->via.array.ptr[2] = object(a2, z); - o->via.array.ptr[3] = object(a3, z); - o->via.array.ptr[4] = object(a4, z); - o->via.array.ptr[5] = object(a5, z); - o->via.array.ptr[6] = object(a6, z); - o->via.array.ptr[7] = object(a7, z); - o->via.array.ptr[8] = object(a8, z); - o->via.array.ptr[9] = object(a9, z); - o->via.array.ptr[10] = object(a10, z); - o->via.array.ptr[11] = object(a11, z); - o->via.array.ptr[12] = object(a12, z); - o->via.array.ptr[13] = object(a13, z); - o->via.array.ptr[14] = object(a14, z); - o->via.array.ptr[15] = object(a15, z); - o->via.array.ptr[16] = object(a16, z); - o->via.array.ptr[17] = object(a17, z); - o->via.array.ptr[18] = object(a18, z); - o->via.array.ptr[19] = object(a19, z); - o->via.array.ptr[20] = object(a20, z); - o->via.array.ptr[21] = object(a21, z); - o->via.array.ptr[22] = object(a22, z); - o->via.array.ptr[23] = object(a23, z); - o->via.array.ptr[24] = object(a24, z); - o->via.array.ptr[25] = object(a25, z); - o->via.array.ptr[26] = object(a26, z); - o->via.array.ptr[27] = object(a27, z); - o->via.array.ptr[28] = object(a28, z); - o->via.array.ptr[29] = object(a29, z); - o->via.array.ptr[30] = object(a30, z); - o->via.array.ptr[31] = object(a31, z); + o->via.array.ptr[0] = msgpack::object(a0, z); + o->via.array.ptr[1] = msgpack::object(a1, z); + o->via.array.ptr[2] = msgpack::object(a2, z); + o->via.array.ptr[3] = msgpack::object(a3, z); + o->via.array.ptr[4] = msgpack::object(a4, z); + o->via.array.ptr[5] = msgpack::object(a5, z); + o->via.array.ptr[6] = msgpack::object(a6, z); + o->via.array.ptr[7] = msgpack::object(a7, z); + o->via.array.ptr[8] = msgpack::object(a8, z); + o->via.array.ptr[9] = msgpack::object(a9, z); + o->via.array.ptr[10] = msgpack::object(a10, z); + o->via.array.ptr[11] = msgpack::object(a11, z); + o->via.array.ptr[12] = msgpack::object(a12, z); + o->via.array.ptr[13] = msgpack::object(a13, z); + o->via.array.ptr[14] = msgpack::object(a14, z); + o->via.array.ptr[15] = msgpack::object(a15, z); + o->via.array.ptr[16] = msgpack::object(a16, z); + o->via.array.ptr[17] = msgpack::object(a17, z); + o->via.array.ptr[18] = msgpack::object(a18, z); + o->via.array.ptr[19] = msgpack::object(a19, z); + o->via.array.ptr[20] = msgpack::object(a20, z); + o->via.array.ptr[21] = msgpack::object(a21, z); + o->via.array.ptr[22] = msgpack::object(a22, z); + o->via.array.ptr[23] = msgpack::object(a23, z); + o->via.array.ptr[24] = msgpack::object(a24, z); + o->via.array.ptr[25] = msgpack::object(a25, z); + o->via.array.ptr[26] = msgpack::object(a26, z); + o->via.array.ptr[27] = msgpack::object(a27, z); + o->via.array.ptr[28] = msgpack::object(a28, z); + o->via.array.ptr[29] = msgpack::object(a29, z); + o->via.array.ptr[30] = msgpack::object(a30, z); + o->via.array.ptr[31] = msgpack::object(a31, z); } A0& a0; diff --git a/include/msgpack/adaptor/detail/cpp03_msgpack_tuple.hpp b/include/msgpack/adaptor/detail/cpp03_msgpack_tuple.hpp index 70346189..bf0e1664 100644 --- a/include/msgpack/adaptor/detail/cpp03_msgpack_tuple.hpp +++ b/include/msgpack/adaptor/detail/cpp03_msgpack_tuple.hpp @@ -9178,7 +9178,7 @@ private: template <> struct tuple<> { tuple() {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } typedef tuple<> value_type; }; @@ -9188,7 +9188,7 @@ struct tuple { tuple() {} tuple(typename tuple_type::transparent_reference _a0) : a0(_a0) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9210,7 +9210,7 @@ struct tuple { tuple() {} tuple(typename tuple_type::transparent_reference _a0, typename tuple_type::transparent_reference _a1) : a0(_a0), a1(_a1) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9233,7 +9233,7 @@ struct tuple { tuple() {} tuple(typename tuple_type::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2) : a0(_a0), a1(_a1), a2(_a2) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9257,7 +9257,7 @@ struct tuple { tuple() {} tuple(typename tuple_type::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3) : a0(_a0), a1(_a1), a2(_a2), a3(_a3) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9282,7 +9282,7 @@ struct tuple { tuple() {} tuple(typename tuple_type::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9308,7 +9308,7 @@ struct tuple { tuple() {} tuple(typename tuple_type::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9335,7 +9335,7 @@ struct tuple { tuple() {} tuple(typename tuple_type::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9363,7 +9363,7 @@ struct tuple { tuple() {} tuple(typename tuple_type::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9392,7 +9392,7 @@ struct tuple { tuple() {} tuple(typename tuple_type::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9422,7 +9422,7 @@ struct tuple { tuple() {} tuple(typename tuple_type::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9453,7 +9453,7 @@ struct tuple { tuple() {} tuple(typename tuple_type::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9485,7 +9485,7 @@ struct tuple { tuple() {} tuple(typename tuple_type::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9518,7 +9518,7 @@ struct tuple { tuple() {} tuple(typename tuple_type::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9552,7 +9552,7 @@ struct tuple { tuple() {} tuple(typename tuple_type::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9587,7 +9587,7 @@ struct tuple { tuple() {} tuple(typename tuple_type::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9623,7 +9623,7 @@ struct tuple::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14, typename tuple_type::transparent_reference _a15) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14), a15(_a15) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9660,7 +9660,7 @@ struct tuple::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14, typename tuple_type::transparent_reference _a15, typename tuple_type::transparent_reference _a16) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14), a15(_a15), a16(_a16) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9698,7 +9698,7 @@ struct tuple::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14, typename tuple_type::transparent_reference _a15, typename tuple_type::transparent_reference _a16, typename tuple_type::transparent_reference _a17) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14), a15(_a15), a16(_a16), a17(_a17) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9737,7 +9737,7 @@ struct tuple::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14, typename tuple_type::transparent_reference _a15, typename tuple_type::transparent_reference _a16, typename tuple_type::transparent_reference _a17, typename tuple_type::transparent_reference _a18) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14), a15(_a15), a16(_a16), a17(_a17), a18(_a18) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9777,7 +9777,7 @@ struct tuple::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14, typename tuple_type::transparent_reference _a15, typename tuple_type::transparent_reference _a16, typename tuple_type::transparent_reference _a17, typename tuple_type::transparent_reference _a18, typename tuple_type::transparent_reference _a19) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14), a15(_a15), a16(_a16), a17(_a17), a18(_a18), a19(_a19) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9818,7 +9818,7 @@ struct tuple::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14, typename tuple_type::transparent_reference _a15, typename tuple_type::transparent_reference _a16, typename tuple_type::transparent_reference _a17, typename tuple_type::transparent_reference _a18, typename tuple_type::transparent_reference _a19, typename tuple_type::transparent_reference _a20) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14), a15(_a15), a16(_a16), a17(_a17), a18(_a18), a19(_a19), a20(_a20) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9860,7 +9860,7 @@ struct tuple::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14, typename tuple_type::transparent_reference _a15, typename tuple_type::transparent_reference _a16, typename tuple_type::transparent_reference _a17, typename tuple_type::transparent_reference _a18, typename tuple_type::transparent_reference _a19, typename tuple_type::transparent_reference _a20, typename tuple_type::transparent_reference _a21) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14), a15(_a15), a16(_a16), a17(_a17), a18(_a18), a19(_a19), a20(_a20), a21(_a21) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9903,7 +9903,7 @@ struct tuple::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14, typename tuple_type::transparent_reference _a15, typename tuple_type::transparent_reference _a16, typename tuple_type::transparent_reference _a17, typename tuple_type::transparent_reference _a18, typename tuple_type::transparent_reference _a19, typename tuple_type::transparent_reference _a20, typename tuple_type::transparent_reference _a21, typename tuple_type::transparent_reference _a22) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14), a15(_a15), a16(_a16), a17(_a17), a18(_a18), a19(_a19), a20(_a20), a21(_a21), a22(_a22) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9947,7 +9947,7 @@ struct tuple::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14, typename tuple_type::transparent_reference _a15, typename tuple_type::transparent_reference _a16, typename tuple_type::transparent_reference _a17, typename tuple_type::transparent_reference _a18, typename tuple_type::transparent_reference _a19, typename tuple_type::transparent_reference _a20, typename tuple_type::transparent_reference _a21, typename tuple_type::transparent_reference _a22, typename tuple_type::transparent_reference _a23) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14), a15(_a15), a16(_a16), a17(_a17), a18(_a18), a19(_a19), a20(_a20), a21(_a21), a22(_a22), a23(_a23) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -9992,7 +9992,7 @@ struct tuple::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14, typename tuple_type::transparent_reference _a15, typename tuple_type::transparent_reference _a16, typename tuple_type::transparent_reference _a17, typename tuple_type::transparent_reference _a18, typename tuple_type::transparent_reference _a19, typename tuple_type::transparent_reference _a20, typename tuple_type::transparent_reference _a21, typename tuple_type::transparent_reference _a22, typename tuple_type::transparent_reference _a23, typename tuple_type::transparent_reference _a24) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14), a15(_a15), a16(_a16), a17(_a17), a18(_a18), a19(_a19), a20(_a20), a21(_a21), a22(_a22), a23(_a23), a24(_a24) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -10038,7 +10038,7 @@ struct tuple::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14, typename tuple_type::transparent_reference _a15, typename tuple_type::transparent_reference _a16, typename tuple_type::transparent_reference _a17, typename tuple_type::transparent_reference _a18, typename tuple_type::transparent_reference _a19, typename tuple_type::transparent_reference _a20, typename tuple_type::transparent_reference _a21, typename tuple_type::transparent_reference _a22, typename tuple_type::transparent_reference _a23, typename tuple_type::transparent_reference _a24, typename tuple_type::transparent_reference _a25) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14), a15(_a15), a16(_a16), a17(_a17), a18(_a18), a19(_a19), a20(_a20), a21(_a21), a22(_a22), a23(_a23), a24(_a24), a25(_a25) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -10085,7 +10085,7 @@ struct tuple::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14, typename tuple_type::transparent_reference _a15, typename tuple_type::transparent_reference _a16, typename tuple_type::transparent_reference _a17, typename tuple_type::transparent_reference _a18, typename tuple_type::transparent_reference _a19, typename tuple_type::transparent_reference _a20, typename tuple_type::transparent_reference _a21, typename tuple_type::transparent_reference _a22, typename tuple_type::transparent_reference _a23, typename tuple_type::transparent_reference _a24, typename tuple_type::transparent_reference _a25, typename tuple_type::transparent_reference _a26) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14), a15(_a15), a16(_a16), a17(_a17), a18(_a18), a19(_a19), a20(_a20), a21(_a21), a22(_a22), a23(_a23), a24(_a24), a25(_a25), a26(_a26) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -10133,7 +10133,7 @@ struct tuple::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14, typename tuple_type::transparent_reference _a15, typename tuple_type::transparent_reference _a16, typename tuple_type::transparent_reference _a17, typename tuple_type::transparent_reference _a18, typename tuple_type::transparent_reference _a19, typename tuple_type::transparent_reference _a20, typename tuple_type::transparent_reference _a21, typename tuple_type::transparent_reference _a22, typename tuple_type::transparent_reference _a23, typename tuple_type::transparent_reference _a24, typename tuple_type::transparent_reference _a25, typename tuple_type::transparent_reference _a26, typename tuple_type::transparent_reference _a27) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14), a15(_a15), a16(_a16), a17(_a17), a18(_a18), a19(_a19), a20(_a20), a21(_a21), a22(_a22), a23(_a23), a24(_a24), a25(_a25), a26(_a26), a27(_a27) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -10182,7 +10182,7 @@ struct tuple::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14, typename tuple_type::transparent_reference _a15, typename tuple_type::transparent_reference _a16, typename tuple_type::transparent_reference _a17, typename tuple_type::transparent_reference _a18, typename tuple_type::transparent_reference _a19, typename tuple_type::transparent_reference _a20, typename tuple_type::transparent_reference _a21, typename tuple_type::transparent_reference _a22, typename tuple_type::transparent_reference _a23, typename tuple_type::transparent_reference _a24, typename tuple_type::transparent_reference _a25, typename tuple_type::transparent_reference _a26, typename tuple_type::transparent_reference _a27, typename tuple_type::transparent_reference _a28) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14), a15(_a15), a16(_a16), a17(_a17), a18(_a18), a19(_a19), a20(_a20), a21(_a21), a22(_a22), a23(_a23), a24(_a24), a25(_a25), a26(_a26), a27(_a27), a28(_a28) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -10232,7 +10232,7 @@ struct tuple::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14, typename tuple_type::transparent_reference _a15, typename tuple_type::transparent_reference _a16, typename tuple_type::transparent_reference _a17, typename tuple_type::transparent_reference _a18, typename tuple_type::transparent_reference _a19, typename tuple_type::transparent_reference _a20, typename tuple_type::transparent_reference _a21, typename tuple_type::transparent_reference _a22, typename tuple_type::transparent_reference _a23, typename tuple_type::transparent_reference _a24, typename tuple_type::transparent_reference _a25, typename tuple_type::transparent_reference _a26, typename tuple_type::transparent_reference _a27, typename tuple_type::transparent_reference _a28, typename tuple_type::transparent_reference _a29) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14), a15(_a15), a16(_a16), a17(_a17), a18(_a18), a19(_a19), a20(_a20), a21(_a21), a22(_a22), a23(_a23), a24(_a24), a25(_a25), a26(_a26), a27(_a27), a28(_a28), a29(_a29) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -10283,7 +10283,7 @@ struct tuple::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14, typename tuple_type::transparent_reference _a15, typename tuple_type::transparent_reference _a16, typename tuple_type::transparent_reference _a17, typename tuple_type::transparent_reference _a18, typename tuple_type::transparent_reference _a19, typename tuple_type::transparent_reference _a20, typename tuple_type::transparent_reference _a21, typename tuple_type::transparent_reference _a22, typename tuple_type::transparent_reference _a23, typename tuple_type::transparent_reference _a24, typename tuple_type::transparent_reference _a25, typename tuple_type::transparent_reference _a26, typename tuple_type::transparent_reference _a27, typename tuple_type::transparent_reference _a28, typename tuple_type::transparent_reference _a29, typename tuple_type::transparent_reference _a30) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14), a15(_a15), a16(_a16), a17(_a17), a18(_a18), a19(_a19), a20(_a20), a21(_a21), a22(_a22), a23(_a23), a24(_a24), a25(_a25), a26(_a26), a27(_a27), a28(_a28), a29(_a29), a30(_a30) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -10335,7 +10335,7 @@ struct tuple::transparent_reference _a0, typename tuple_type::transparent_reference _a1, typename tuple_type::transparent_reference _a2, typename tuple_type::transparent_reference _a3, typename tuple_type::transparent_reference _a4, typename tuple_type::transparent_reference _a5, typename tuple_type::transparent_reference _a6, typename tuple_type::transparent_reference _a7, typename tuple_type::transparent_reference _a8, typename tuple_type::transparent_reference _a9, typename tuple_type::transparent_reference _a10, typename tuple_type::transparent_reference _a11, typename tuple_type::transparent_reference _a12, typename tuple_type::transparent_reference _a13, typename tuple_type::transparent_reference _a14, typename tuple_type::transparent_reference _a15, typename tuple_type::transparent_reference _a16, typename tuple_type::transparent_reference _a17, typename tuple_type::transparent_reference _a18, typename tuple_type::transparent_reference _a19, typename tuple_type::transparent_reference _a20, typename tuple_type::transparent_reference _a21, typename tuple_type::transparent_reference _a22, typename tuple_type::transparent_reference _a23, typename tuple_type::transparent_reference _a24, typename tuple_type::transparent_reference _a25, typename tuple_type::transparent_reference _a26, typename tuple_type::transparent_reference _a27, typename tuple_type::transparent_reference _a28, typename tuple_type::transparent_reference _a29, typename tuple_type::transparent_reference _a30, typename tuple_type::transparent_reference _a31) : a0(_a0), a1(_a1), a2(_a2), a3(_a3), a4(_a4), a5(_a5), a6(_a6), a7(_a7), a8(_a8), a9(_a9), a10(_a10), a11(_a11), a12(_a12), a13(_a13), a14(_a14), a15(_a15), a16(_a16), a17(_a17), a18(_a18), a19(_a19), a20(_a20), a21(_a21), a22(_a22), a23(_a23), a24(_a24), a25(_a25), a26(_a26), a27(_a27), a28(_a28), a29(_a29), a30(_a30), a31(_a31) {} - tuple(object const& o) { o.convert(*this); } + tuple(msgpack::object const& o) { o.convert(*this); } template typename tuple_element::reference get() { return tuple_element(*this).get(); } template typename const_tuple_element::const_reference get() const @@ -10583,18 +10583,18 @@ inline tuple> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple<>&) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } return o; } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 1) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10602,10 +10602,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 2) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10614,10 +10614,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 3) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10627,10 +10627,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 4) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10641,10 +10641,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 5) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10656,10 +10656,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 6) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10672,10 +10672,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 7) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10689,10 +10689,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 8) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10707,10 +10707,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 9) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10726,10 +10726,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 10) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10746,10 +10746,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 11) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10767,10 +10767,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 12) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10789,10 +10789,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 13) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10812,10 +10812,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 14) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10836,10 +10836,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 15) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10861,10 +10861,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 16) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10887,10 +10887,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 17) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10914,10 +10914,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 18) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10942,10 +10942,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 19) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -10971,10 +10971,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 20) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -11001,10 +11001,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 21) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -11032,10 +11032,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 22) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -11064,10 +11064,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 23) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -11097,10 +11097,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 24) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -11131,10 +11131,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 25) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -11166,10 +11166,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 26) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -11202,10 +11202,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 27) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -11239,10 +11239,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 28) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -11277,10 +11277,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 29) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -11316,10 +11316,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 30) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -11356,10 +11356,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 31) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -11397,10 +11397,10 @@ inline object const& operator>> ( } template -inline object const& operator>> ( - object const& o, +inline msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < 32) { throw type_error(); } o.via.array.ptr[0].convert::type>(v.template get<0>()); @@ -12265,859 +12265,859 @@ inline const packer& operator<< ( inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple<>&) { - o.type = type::ARRAY; + o.type = msgpack::type::ARRAY; o.via.array.ptr = nullptr; o.via.array.size = 0; } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*1)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*1)); o.via.array.size = 1; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*2)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*2)); o.via.array.size = 2; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*3)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*3)); o.via.array.size = 3; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*4)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*4)); o.via.array.size = 4; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*5)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*5)); o.via.array.size = 5; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*6)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*6)); o.via.array.size = 6; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*7)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*7)); o.via.array.size = 7; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*8)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*8)); o.via.array.size = 8; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*9)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*9)); o.via.array.size = 9; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*10)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*10)); o.via.array.size = 10; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*11)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*11)); o.via.array.size = 11; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*12)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*12)); o.via.array.size = 12; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*13)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*13)); o.via.array.size = 13; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*14)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*14)); o.via.array.size = 14; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*15)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*15)); o.via.array.size = 15; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*16)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*16)); o.via.array.size = 16; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); - o.via.array.ptr[15] = object(v.template get<15>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); + o.via.array.ptr[15] = msgpack::object(v.template get<15>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*17)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*17)); o.via.array.size = 17; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); - o.via.array.ptr[15] = object(v.template get<15>(), o.zone); - o.via.array.ptr[16] = object(v.template get<16>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); + o.via.array.ptr[15] = msgpack::object(v.template get<15>(), o.zone); + o.via.array.ptr[16] = msgpack::object(v.template get<16>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*18)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*18)); o.via.array.size = 18; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); - o.via.array.ptr[15] = object(v.template get<15>(), o.zone); - o.via.array.ptr[16] = object(v.template get<16>(), o.zone); - o.via.array.ptr[17] = object(v.template get<17>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); + o.via.array.ptr[15] = msgpack::object(v.template get<15>(), o.zone); + o.via.array.ptr[16] = msgpack::object(v.template get<16>(), o.zone); + o.via.array.ptr[17] = msgpack::object(v.template get<17>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*19)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*19)); o.via.array.size = 19; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); - o.via.array.ptr[15] = object(v.template get<15>(), o.zone); - o.via.array.ptr[16] = object(v.template get<16>(), o.zone); - o.via.array.ptr[17] = object(v.template get<17>(), o.zone); - o.via.array.ptr[18] = object(v.template get<18>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); + o.via.array.ptr[15] = msgpack::object(v.template get<15>(), o.zone); + o.via.array.ptr[16] = msgpack::object(v.template get<16>(), o.zone); + o.via.array.ptr[17] = msgpack::object(v.template get<17>(), o.zone); + o.via.array.ptr[18] = msgpack::object(v.template get<18>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*20)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*20)); o.via.array.size = 20; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); - o.via.array.ptr[15] = object(v.template get<15>(), o.zone); - o.via.array.ptr[16] = object(v.template get<16>(), o.zone); - o.via.array.ptr[17] = object(v.template get<17>(), o.zone); - o.via.array.ptr[18] = object(v.template get<18>(), o.zone); - o.via.array.ptr[19] = object(v.template get<19>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); + o.via.array.ptr[15] = msgpack::object(v.template get<15>(), o.zone); + o.via.array.ptr[16] = msgpack::object(v.template get<16>(), o.zone); + o.via.array.ptr[17] = msgpack::object(v.template get<17>(), o.zone); + o.via.array.ptr[18] = msgpack::object(v.template get<18>(), o.zone); + o.via.array.ptr[19] = msgpack::object(v.template get<19>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*21)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*21)); o.via.array.size = 21; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); - o.via.array.ptr[15] = object(v.template get<15>(), o.zone); - o.via.array.ptr[16] = object(v.template get<16>(), o.zone); - o.via.array.ptr[17] = object(v.template get<17>(), o.zone); - o.via.array.ptr[18] = object(v.template get<18>(), o.zone); - o.via.array.ptr[19] = object(v.template get<19>(), o.zone); - o.via.array.ptr[20] = object(v.template get<20>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); + o.via.array.ptr[15] = msgpack::object(v.template get<15>(), o.zone); + o.via.array.ptr[16] = msgpack::object(v.template get<16>(), o.zone); + o.via.array.ptr[17] = msgpack::object(v.template get<17>(), o.zone); + o.via.array.ptr[18] = msgpack::object(v.template get<18>(), o.zone); + o.via.array.ptr[19] = msgpack::object(v.template get<19>(), o.zone); + o.via.array.ptr[20] = msgpack::object(v.template get<20>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*22)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*22)); o.via.array.size = 22; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); - o.via.array.ptr[15] = object(v.template get<15>(), o.zone); - o.via.array.ptr[16] = object(v.template get<16>(), o.zone); - o.via.array.ptr[17] = object(v.template get<17>(), o.zone); - o.via.array.ptr[18] = object(v.template get<18>(), o.zone); - o.via.array.ptr[19] = object(v.template get<19>(), o.zone); - o.via.array.ptr[20] = object(v.template get<20>(), o.zone); - o.via.array.ptr[21] = object(v.template get<21>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); + o.via.array.ptr[15] = msgpack::object(v.template get<15>(), o.zone); + o.via.array.ptr[16] = msgpack::object(v.template get<16>(), o.zone); + o.via.array.ptr[17] = msgpack::object(v.template get<17>(), o.zone); + o.via.array.ptr[18] = msgpack::object(v.template get<18>(), o.zone); + o.via.array.ptr[19] = msgpack::object(v.template get<19>(), o.zone); + o.via.array.ptr[20] = msgpack::object(v.template get<20>(), o.zone); + o.via.array.ptr[21] = msgpack::object(v.template get<21>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*23)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*23)); o.via.array.size = 23; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); - o.via.array.ptr[15] = object(v.template get<15>(), o.zone); - o.via.array.ptr[16] = object(v.template get<16>(), o.zone); - o.via.array.ptr[17] = object(v.template get<17>(), o.zone); - o.via.array.ptr[18] = object(v.template get<18>(), o.zone); - o.via.array.ptr[19] = object(v.template get<19>(), o.zone); - o.via.array.ptr[20] = object(v.template get<20>(), o.zone); - o.via.array.ptr[21] = object(v.template get<21>(), o.zone); - o.via.array.ptr[22] = object(v.template get<22>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); + o.via.array.ptr[15] = msgpack::object(v.template get<15>(), o.zone); + o.via.array.ptr[16] = msgpack::object(v.template get<16>(), o.zone); + o.via.array.ptr[17] = msgpack::object(v.template get<17>(), o.zone); + o.via.array.ptr[18] = msgpack::object(v.template get<18>(), o.zone); + o.via.array.ptr[19] = msgpack::object(v.template get<19>(), o.zone); + o.via.array.ptr[20] = msgpack::object(v.template get<20>(), o.zone); + o.via.array.ptr[21] = msgpack::object(v.template get<21>(), o.zone); + o.via.array.ptr[22] = msgpack::object(v.template get<22>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*24)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*24)); o.via.array.size = 24; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); - o.via.array.ptr[15] = object(v.template get<15>(), o.zone); - o.via.array.ptr[16] = object(v.template get<16>(), o.zone); - o.via.array.ptr[17] = object(v.template get<17>(), o.zone); - o.via.array.ptr[18] = object(v.template get<18>(), o.zone); - o.via.array.ptr[19] = object(v.template get<19>(), o.zone); - o.via.array.ptr[20] = object(v.template get<20>(), o.zone); - o.via.array.ptr[21] = object(v.template get<21>(), o.zone); - o.via.array.ptr[22] = object(v.template get<22>(), o.zone); - o.via.array.ptr[23] = object(v.template get<23>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); + o.via.array.ptr[15] = msgpack::object(v.template get<15>(), o.zone); + o.via.array.ptr[16] = msgpack::object(v.template get<16>(), o.zone); + o.via.array.ptr[17] = msgpack::object(v.template get<17>(), o.zone); + o.via.array.ptr[18] = msgpack::object(v.template get<18>(), o.zone); + o.via.array.ptr[19] = msgpack::object(v.template get<19>(), o.zone); + o.via.array.ptr[20] = msgpack::object(v.template get<20>(), o.zone); + o.via.array.ptr[21] = msgpack::object(v.template get<21>(), o.zone); + o.via.array.ptr[22] = msgpack::object(v.template get<22>(), o.zone); + o.via.array.ptr[23] = msgpack::object(v.template get<23>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*25)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*25)); o.via.array.size = 25; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); - o.via.array.ptr[15] = object(v.template get<15>(), o.zone); - o.via.array.ptr[16] = object(v.template get<16>(), o.zone); - o.via.array.ptr[17] = object(v.template get<17>(), o.zone); - o.via.array.ptr[18] = object(v.template get<18>(), o.zone); - o.via.array.ptr[19] = object(v.template get<19>(), o.zone); - o.via.array.ptr[20] = object(v.template get<20>(), o.zone); - o.via.array.ptr[21] = object(v.template get<21>(), o.zone); - o.via.array.ptr[22] = object(v.template get<22>(), o.zone); - o.via.array.ptr[23] = object(v.template get<23>(), o.zone); - o.via.array.ptr[24] = object(v.template get<24>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); + o.via.array.ptr[15] = msgpack::object(v.template get<15>(), o.zone); + o.via.array.ptr[16] = msgpack::object(v.template get<16>(), o.zone); + o.via.array.ptr[17] = msgpack::object(v.template get<17>(), o.zone); + o.via.array.ptr[18] = msgpack::object(v.template get<18>(), o.zone); + o.via.array.ptr[19] = msgpack::object(v.template get<19>(), o.zone); + o.via.array.ptr[20] = msgpack::object(v.template get<20>(), o.zone); + o.via.array.ptr[21] = msgpack::object(v.template get<21>(), o.zone); + o.via.array.ptr[22] = msgpack::object(v.template get<22>(), o.zone); + o.via.array.ptr[23] = msgpack::object(v.template get<23>(), o.zone); + o.via.array.ptr[24] = msgpack::object(v.template get<24>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*26)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*26)); o.via.array.size = 26; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); - o.via.array.ptr[15] = object(v.template get<15>(), o.zone); - o.via.array.ptr[16] = object(v.template get<16>(), o.zone); - o.via.array.ptr[17] = object(v.template get<17>(), o.zone); - o.via.array.ptr[18] = object(v.template get<18>(), o.zone); - o.via.array.ptr[19] = object(v.template get<19>(), o.zone); - o.via.array.ptr[20] = object(v.template get<20>(), o.zone); - o.via.array.ptr[21] = object(v.template get<21>(), o.zone); - o.via.array.ptr[22] = object(v.template get<22>(), o.zone); - o.via.array.ptr[23] = object(v.template get<23>(), o.zone); - o.via.array.ptr[24] = object(v.template get<24>(), o.zone); - o.via.array.ptr[25] = object(v.template get<25>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); + o.via.array.ptr[15] = msgpack::object(v.template get<15>(), o.zone); + o.via.array.ptr[16] = msgpack::object(v.template get<16>(), o.zone); + o.via.array.ptr[17] = msgpack::object(v.template get<17>(), o.zone); + o.via.array.ptr[18] = msgpack::object(v.template get<18>(), o.zone); + o.via.array.ptr[19] = msgpack::object(v.template get<19>(), o.zone); + o.via.array.ptr[20] = msgpack::object(v.template get<20>(), o.zone); + o.via.array.ptr[21] = msgpack::object(v.template get<21>(), o.zone); + o.via.array.ptr[22] = msgpack::object(v.template get<22>(), o.zone); + o.via.array.ptr[23] = msgpack::object(v.template get<23>(), o.zone); + o.via.array.ptr[24] = msgpack::object(v.template get<24>(), o.zone); + o.via.array.ptr[25] = msgpack::object(v.template get<25>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*27)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*27)); o.via.array.size = 27; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); - o.via.array.ptr[15] = object(v.template get<15>(), o.zone); - o.via.array.ptr[16] = object(v.template get<16>(), o.zone); - o.via.array.ptr[17] = object(v.template get<17>(), o.zone); - o.via.array.ptr[18] = object(v.template get<18>(), o.zone); - o.via.array.ptr[19] = object(v.template get<19>(), o.zone); - o.via.array.ptr[20] = object(v.template get<20>(), o.zone); - o.via.array.ptr[21] = object(v.template get<21>(), o.zone); - o.via.array.ptr[22] = object(v.template get<22>(), o.zone); - o.via.array.ptr[23] = object(v.template get<23>(), o.zone); - o.via.array.ptr[24] = object(v.template get<24>(), o.zone); - o.via.array.ptr[25] = object(v.template get<25>(), o.zone); - o.via.array.ptr[26] = object(v.template get<26>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); + o.via.array.ptr[15] = msgpack::object(v.template get<15>(), o.zone); + o.via.array.ptr[16] = msgpack::object(v.template get<16>(), o.zone); + o.via.array.ptr[17] = msgpack::object(v.template get<17>(), o.zone); + o.via.array.ptr[18] = msgpack::object(v.template get<18>(), o.zone); + o.via.array.ptr[19] = msgpack::object(v.template get<19>(), o.zone); + o.via.array.ptr[20] = msgpack::object(v.template get<20>(), o.zone); + o.via.array.ptr[21] = msgpack::object(v.template get<21>(), o.zone); + o.via.array.ptr[22] = msgpack::object(v.template get<22>(), o.zone); + o.via.array.ptr[23] = msgpack::object(v.template get<23>(), o.zone); + o.via.array.ptr[24] = msgpack::object(v.template get<24>(), o.zone); + o.via.array.ptr[25] = msgpack::object(v.template get<25>(), o.zone); + o.via.array.ptr[26] = msgpack::object(v.template get<26>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*28)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*28)); o.via.array.size = 28; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); - o.via.array.ptr[15] = object(v.template get<15>(), o.zone); - o.via.array.ptr[16] = object(v.template get<16>(), o.zone); - o.via.array.ptr[17] = object(v.template get<17>(), o.zone); - o.via.array.ptr[18] = object(v.template get<18>(), o.zone); - o.via.array.ptr[19] = object(v.template get<19>(), o.zone); - o.via.array.ptr[20] = object(v.template get<20>(), o.zone); - o.via.array.ptr[21] = object(v.template get<21>(), o.zone); - o.via.array.ptr[22] = object(v.template get<22>(), o.zone); - o.via.array.ptr[23] = object(v.template get<23>(), o.zone); - o.via.array.ptr[24] = object(v.template get<24>(), o.zone); - o.via.array.ptr[25] = object(v.template get<25>(), o.zone); - o.via.array.ptr[26] = object(v.template get<26>(), o.zone); - o.via.array.ptr[27] = object(v.template get<27>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); + o.via.array.ptr[15] = msgpack::object(v.template get<15>(), o.zone); + o.via.array.ptr[16] = msgpack::object(v.template get<16>(), o.zone); + o.via.array.ptr[17] = msgpack::object(v.template get<17>(), o.zone); + o.via.array.ptr[18] = msgpack::object(v.template get<18>(), o.zone); + o.via.array.ptr[19] = msgpack::object(v.template get<19>(), o.zone); + o.via.array.ptr[20] = msgpack::object(v.template get<20>(), o.zone); + o.via.array.ptr[21] = msgpack::object(v.template get<21>(), o.zone); + o.via.array.ptr[22] = msgpack::object(v.template get<22>(), o.zone); + o.via.array.ptr[23] = msgpack::object(v.template get<23>(), o.zone); + o.via.array.ptr[24] = msgpack::object(v.template get<24>(), o.zone); + o.via.array.ptr[25] = msgpack::object(v.template get<25>(), o.zone); + o.via.array.ptr[26] = msgpack::object(v.template get<26>(), o.zone); + o.via.array.ptr[27] = msgpack::object(v.template get<27>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*29)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*29)); o.via.array.size = 29; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); - o.via.array.ptr[15] = object(v.template get<15>(), o.zone); - o.via.array.ptr[16] = object(v.template get<16>(), o.zone); - o.via.array.ptr[17] = object(v.template get<17>(), o.zone); - o.via.array.ptr[18] = object(v.template get<18>(), o.zone); - o.via.array.ptr[19] = object(v.template get<19>(), o.zone); - o.via.array.ptr[20] = object(v.template get<20>(), o.zone); - o.via.array.ptr[21] = object(v.template get<21>(), o.zone); - o.via.array.ptr[22] = object(v.template get<22>(), o.zone); - o.via.array.ptr[23] = object(v.template get<23>(), o.zone); - o.via.array.ptr[24] = object(v.template get<24>(), o.zone); - o.via.array.ptr[25] = object(v.template get<25>(), o.zone); - o.via.array.ptr[26] = object(v.template get<26>(), o.zone); - o.via.array.ptr[27] = object(v.template get<27>(), o.zone); - o.via.array.ptr[28] = object(v.template get<28>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); + o.via.array.ptr[15] = msgpack::object(v.template get<15>(), o.zone); + o.via.array.ptr[16] = msgpack::object(v.template get<16>(), o.zone); + o.via.array.ptr[17] = msgpack::object(v.template get<17>(), o.zone); + o.via.array.ptr[18] = msgpack::object(v.template get<18>(), o.zone); + o.via.array.ptr[19] = msgpack::object(v.template get<19>(), o.zone); + o.via.array.ptr[20] = msgpack::object(v.template get<20>(), o.zone); + o.via.array.ptr[21] = msgpack::object(v.template get<21>(), o.zone); + o.via.array.ptr[22] = msgpack::object(v.template get<22>(), o.zone); + o.via.array.ptr[23] = msgpack::object(v.template get<23>(), o.zone); + o.via.array.ptr[24] = msgpack::object(v.template get<24>(), o.zone); + o.via.array.ptr[25] = msgpack::object(v.template get<25>(), o.zone); + o.via.array.ptr[26] = msgpack::object(v.template get<26>(), o.zone); + o.via.array.ptr[27] = msgpack::object(v.template get<27>(), o.zone); + o.via.array.ptr[28] = msgpack::object(v.template get<28>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*30)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*30)); o.via.array.size = 30; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); - o.via.array.ptr[15] = object(v.template get<15>(), o.zone); - o.via.array.ptr[16] = object(v.template get<16>(), o.zone); - o.via.array.ptr[17] = object(v.template get<17>(), o.zone); - o.via.array.ptr[18] = object(v.template get<18>(), o.zone); - o.via.array.ptr[19] = object(v.template get<19>(), o.zone); - o.via.array.ptr[20] = object(v.template get<20>(), o.zone); - o.via.array.ptr[21] = object(v.template get<21>(), o.zone); - o.via.array.ptr[22] = object(v.template get<22>(), o.zone); - o.via.array.ptr[23] = object(v.template get<23>(), o.zone); - o.via.array.ptr[24] = object(v.template get<24>(), o.zone); - o.via.array.ptr[25] = object(v.template get<25>(), o.zone); - o.via.array.ptr[26] = object(v.template get<26>(), o.zone); - o.via.array.ptr[27] = object(v.template get<27>(), o.zone); - o.via.array.ptr[28] = object(v.template get<28>(), o.zone); - o.via.array.ptr[29] = object(v.template get<29>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); + o.via.array.ptr[15] = msgpack::object(v.template get<15>(), o.zone); + o.via.array.ptr[16] = msgpack::object(v.template get<16>(), o.zone); + o.via.array.ptr[17] = msgpack::object(v.template get<17>(), o.zone); + o.via.array.ptr[18] = msgpack::object(v.template get<18>(), o.zone); + o.via.array.ptr[19] = msgpack::object(v.template get<19>(), o.zone); + o.via.array.ptr[20] = msgpack::object(v.template get<20>(), o.zone); + o.via.array.ptr[21] = msgpack::object(v.template get<21>(), o.zone); + o.via.array.ptr[22] = msgpack::object(v.template get<22>(), o.zone); + o.via.array.ptr[23] = msgpack::object(v.template get<23>(), o.zone); + o.via.array.ptr[24] = msgpack::object(v.template get<24>(), o.zone); + o.via.array.ptr[25] = msgpack::object(v.template get<25>(), o.zone); + o.via.array.ptr[26] = msgpack::object(v.template get<26>(), o.zone); + o.via.array.ptr[27] = msgpack::object(v.template get<27>(), o.zone); + o.via.array.ptr[28] = msgpack::object(v.template get<28>(), o.zone); + o.via.array.ptr[29] = msgpack::object(v.template get<29>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*31)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*31)); o.via.array.size = 31; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); - o.via.array.ptr[15] = object(v.template get<15>(), o.zone); - o.via.array.ptr[16] = object(v.template get<16>(), o.zone); - o.via.array.ptr[17] = object(v.template get<17>(), o.zone); - o.via.array.ptr[18] = object(v.template get<18>(), o.zone); - o.via.array.ptr[19] = object(v.template get<19>(), o.zone); - o.via.array.ptr[20] = object(v.template get<20>(), o.zone); - o.via.array.ptr[21] = object(v.template get<21>(), o.zone); - o.via.array.ptr[22] = object(v.template get<22>(), o.zone); - o.via.array.ptr[23] = object(v.template get<23>(), o.zone); - o.via.array.ptr[24] = object(v.template get<24>(), o.zone); - o.via.array.ptr[25] = object(v.template get<25>(), o.zone); - o.via.array.ptr[26] = object(v.template get<26>(), o.zone); - o.via.array.ptr[27] = object(v.template get<27>(), o.zone); - o.via.array.ptr[28] = object(v.template get<28>(), o.zone); - o.via.array.ptr[29] = object(v.template get<29>(), o.zone); - o.via.array.ptr[30] = object(v.template get<30>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); + o.via.array.ptr[15] = msgpack::object(v.template get<15>(), o.zone); + o.via.array.ptr[16] = msgpack::object(v.template get<16>(), o.zone); + o.via.array.ptr[17] = msgpack::object(v.template get<17>(), o.zone); + o.via.array.ptr[18] = msgpack::object(v.template get<18>(), o.zone); + o.via.array.ptr[19] = msgpack::object(v.template get<19>(), o.zone); + o.via.array.ptr[20] = msgpack::object(v.template get<20>(), o.zone); + o.via.array.ptr[21] = msgpack::object(v.template get<21>(), o.zone); + o.via.array.ptr[22] = msgpack::object(v.template get<22>(), o.zone); + o.via.array.ptr[23] = msgpack::object(v.template get<23>(), o.zone); + o.via.array.ptr[24] = msgpack::object(v.template get<24>(), o.zone); + o.via.array.ptr[25] = msgpack::object(v.template get<25>(), o.zone); + o.via.array.ptr[26] = msgpack::object(v.template get<26>(), o.zone); + o.via.array.ptr[27] = msgpack::object(v.template get<27>(), o.zone); + o.via.array.ptr[28] = msgpack::object(v.template get<28>(), o.zone); + o.via.array.ptr[29] = msgpack::object(v.template get<29>(), o.zone); + o.via.array.ptr[30] = msgpack::object(v.template get<30>(), o.zone); } template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*32)); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*32)); o.via.array.size = 32; - o.via.array.ptr[0] = object(v.template get<0>(), o.zone); - o.via.array.ptr[1] = object(v.template get<1>(), o.zone); - o.via.array.ptr[2] = object(v.template get<2>(), o.zone); - o.via.array.ptr[3] = object(v.template get<3>(), o.zone); - o.via.array.ptr[4] = object(v.template get<4>(), o.zone); - o.via.array.ptr[5] = object(v.template get<5>(), o.zone); - o.via.array.ptr[6] = object(v.template get<6>(), o.zone); - o.via.array.ptr[7] = object(v.template get<7>(), o.zone); - o.via.array.ptr[8] = object(v.template get<8>(), o.zone); - o.via.array.ptr[9] = object(v.template get<9>(), o.zone); - o.via.array.ptr[10] = object(v.template get<10>(), o.zone); - o.via.array.ptr[11] = object(v.template get<11>(), o.zone); - o.via.array.ptr[12] = object(v.template get<12>(), o.zone); - o.via.array.ptr[13] = object(v.template get<13>(), o.zone); - o.via.array.ptr[14] = object(v.template get<14>(), o.zone); - o.via.array.ptr[15] = object(v.template get<15>(), o.zone); - o.via.array.ptr[16] = object(v.template get<16>(), o.zone); - o.via.array.ptr[17] = object(v.template get<17>(), o.zone); - o.via.array.ptr[18] = object(v.template get<18>(), o.zone); - o.via.array.ptr[19] = object(v.template get<19>(), o.zone); - o.via.array.ptr[20] = object(v.template get<20>(), o.zone); - o.via.array.ptr[21] = object(v.template get<21>(), o.zone); - o.via.array.ptr[22] = object(v.template get<22>(), o.zone); - o.via.array.ptr[23] = object(v.template get<23>(), o.zone); - o.via.array.ptr[24] = object(v.template get<24>(), o.zone); - o.via.array.ptr[25] = object(v.template get<25>(), o.zone); - o.via.array.ptr[26] = object(v.template get<26>(), o.zone); - o.via.array.ptr[27] = object(v.template get<27>(), o.zone); - o.via.array.ptr[28] = object(v.template get<28>(), o.zone); - o.via.array.ptr[29] = object(v.template get<29>(), o.zone); - o.via.array.ptr[30] = object(v.template get<30>(), o.zone); - o.via.array.ptr[31] = object(v.template get<31>(), o.zone); + o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone); + o.via.array.ptr[1] = msgpack::object(v.template get<1>(), o.zone); + o.via.array.ptr[2] = msgpack::object(v.template get<2>(), o.zone); + o.via.array.ptr[3] = msgpack::object(v.template get<3>(), o.zone); + o.via.array.ptr[4] = msgpack::object(v.template get<4>(), o.zone); + o.via.array.ptr[5] = msgpack::object(v.template get<5>(), o.zone); + o.via.array.ptr[6] = msgpack::object(v.template get<6>(), o.zone); + o.via.array.ptr[7] = msgpack::object(v.template get<7>(), o.zone); + o.via.array.ptr[8] = msgpack::object(v.template get<8>(), o.zone); + o.via.array.ptr[9] = msgpack::object(v.template get<9>(), o.zone); + o.via.array.ptr[10] = msgpack::object(v.template get<10>(), o.zone); + o.via.array.ptr[11] = msgpack::object(v.template get<11>(), o.zone); + o.via.array.ptr[12] = msgpack::object(v.template get<12>(), o.zone); + o.via.array.ptr[13] = msgpack::object(v.template get<13>(), o.zone); + o.via.array.ptr[14] = msgpack::object(v.template get<14>(), o.zone); + o.via.array.ptr[15] = msgpack::object(v.template get<15>(), o.zone); + o.via.array.ptr[16] = msgpack::object(v.template get<16>(), o.zone); + o.via.array.ptr[17] = msgpack::object(v.template get<17>(), o.zone); + o.via.array.ptr[18] = msgpack::object(v.template get<18>(), o.zone); + o.via.array.ptr[19] = msgpack::object(v.template get<19>(), o.zone); + o.via.array.ptr[20] = msgpack::object(v.template get<20>(), o.zone); + o.via.array.ptr[21] = msgpack::object(v.template get<21>(), o.zone); + o.via.array.ptr[22] = msgpack::object(v.template get<22>(), o.zone); + o.via.array.ptr[23] = msgpack::object(v.template get<23>(), o.zone); + o.via.array.ptr[24] = msgpack::object(v.template get<24>(), o.zone); + o.via.array.ptr[25] = msgpack::object(v.template get<25>(), o.zone); + o.via.array.ptr[26] = msgpack::object(v.template get<26>(), o.zone); + o.via.array.ptr[27] = msgpack::object(v.template get<27>(), o.zone); + o.via.array.ptr[28] = msgpack::object(v.template get<28>(), o.zone); + o.via.array.ptr[29] = msgpack::object(v.template get<29>(), o.zone); + o.via.array.ptr[30] = msgpack::object(v.template get<30>(), o.zone); + o.via.array.ptr[31] = msgpack::object(v.template get<31>(), o.zone); } diff --git a/include/msgpack/adaptor/detail/cpp03_msgpack_tuple_fwd.hpp b/include/msgpack/adaptor/detail/cpp03_msgpack_tuple_fwd.hpp index da8a9f26..88f6413f 100644 --- a/include/msgpack/adaptor/detail/cpp03_msgpack_tuple_fwd.hpp +++ b/include/msgpack/adaptor/detail/cpp03_msgpack_tuple_fwd.hpp @@ -3704,169 +3704,169 @@ tuple> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple<>&); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); @@ -4038,167 +4038,167 @@ const packer& operator<< ( void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple<>&); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, const type::tuple& v); diff --git a/include/msgpack/adaptor/detail/cpp11_define.hpp b/include/msgpack/adaptor/detail/cpp11_define.hpp index 76e8ad3f..00dd948a 100644 --- a/include/msgpack/adaptor/detail/cpp11_define.hpp +++ b/include/msgpack/adaptor/detail/cpp11_define.hpp @@ -47,19 +47,19 @@ #define MSGPACK_ADD_ENUM(enum) \ namespace msgpack { \ MSGPACK_API_VERSION_NAMESPACE(v1) { \ - inline object const& operator>> (object const& o, enum& v) \ + inline msgpack::object const& operator>> (msgpack::object const& o, enum& v) \ { \ std::underlying_type::type tmp; \ o >> tmp; \ v = static_cast(tmp); \ return o; \ } \ - inline void operator<< (object& o, const enum& v) \ + inline void operator<< (msgpack::object& o, const enum& v) \ { \ auto tmp = static_cast::type>(v); \ o << tmp; \ } \ - inline void operator<< (object::with_zone& o, const enum& v) \ + inline void operator<< (msgpack::object::with_zone& o, const enum& v) \ { \ auto tmp = static_cast::type>(v); \ o << tmp; \ @@ -129,14 +129,14 @@ struct define { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } define_imp, sizeof...(Args)>::unpack(o, a); } void msgpack_object(msgpack::object* o, msgpack::zone& z) const { - o->type = type::ARRAY; - o->via.array.ptr = static_cast(z.allocate_align(sizeof(object)*sizeof...(Args))); + o->type = msgpack::type::ARRAY; + o->via.array.ptr = static_cast(z.allocate_align(sizeof(msgpack::object)*sizeof...(Args))); o->via.array.size = sizeof...(Args); define_imp, sizeof...(Args)>::object(o, z, a); @@ -156,11 +156,11 @@ struct define<> { } void msgpack_unpack(msgpack::object const& o) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } } void msgpack_object(msgpack::object* o, msgpack::zone&) const { - o->type = type::ARRAY; + o->type = msgpack::type::ARRAY; o->via.array.ptr = NULL; o->via.array.size = 0; } diff --git a/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp b/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp index 3b532d87..2e9dcb34 100644 --- a/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp +++ b/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp @@ -133,7 +133,7 @@ const packer& operator<< ( template struct MsgpackTupleConverter { static void convert( - object const& o, + msgpack::object const& o, Tuple& v) { MsgpackTupleConverter::convert(o, v); o.via.array.ptr[N-1].convert(v))>::type>(type::get(v)); @@ -143,7 +143,7 @@ struct MsgpackTupleConverter { template struct MsgpackTupleConverter { static void convert ( - object const& o, + msgpack::object const& o, Tuple& v) { o.via.array.ptr[0].convert(v))>::type>(type::get<0>(v)); } @@ -152,16 +152,16 @@ struct MsgpackTupleConverter { template struct MsgpackTupleConverter { static void convert ( - object const&, + msgpack::object const&, Tuple&) { } }; template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size < sizeof...(Args)) { throw type_error(); } MsgpackTupleConverter::convert(o, v); return o; @@ -171,36 +171,36 @@ object const& operator>> ( template struct MsgpackTupleToObjectWithZone { static void convert( - object::with_zone& o, + msgpack::object::with_zone& o, const Tuple& v) { MsgpackTupleToObjectWithZone::convert(o, v); - o.via.array.ptr[N-1] = object(type::get(v), o.zone); + o.via.array.ptr[N-1] = msgpack::object(type::get(v), o.zone); } }; template struct MsgpackTupleToObjectWithZone { static void convert ( - object::with_zone& o, + msgpack::object::with_zone& o, const Tuple& v) { - o.via.array.ptr[0] = object(type::get<0>(v), o.zone); + o.via.array.ptr[0] = msgpack::object(type::get<0>(v), o.zone); } }; template struct MsgpackTupleToObjectWithZone { static void convert ( - object::with_zone&, + msgpack::object::with_zone&, const Tuple&) { } }; template inline void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, type::tuple const& v) { - o.type = type::ARRAY; - o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object)*sizeof...(Args))); + o.type = msgpack::type::ARRAY; + o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*sizeof...(Args))); o.via.array.size = sizeof...(Args); MsgpackTupleToObjectWithZone::convert(o, v); } diff --git a/include/msgpack/adaptor/detail/cpp11_msgpack_tuple_fwd.hpp b/include/msgpack/adaptor/detail/cpp11_msgpack_tuple_fwd.hpp index b9f148ef..5b144511 100644 --- a/include/msgpack/adaptor/detail/cpp11_msgpack_tuple_fwd.hpp +++ b/include/msgpack/adaptor/detail/cpp11_msgpack_tuple_fwd.hpp @@ -64,8 +64,8 @@ template struct MsgpackTupleConverter; template -object const& operator>> ( - object const& o, +msgpack::object const& operator>> ( + msgpack::object const& o, type::tuple& v); // --- Convert from tuple to object with zone --- @@ -74,7 +74,7 @@ struct MsgpackTupleToObjectWithZone; template void operator<< ( - object::with_zone& o, + msgpack::object::with_zone& o, type::tuple const& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/fixint.hpp b/include/msgpack/adaptor/fixint.hpp index eb7f7a8a..243c8f0b 100644 --- a/include/msgpack/adaptor/fixint.hpp +++ b/include/msgpack/adaptor/fixint.hpp @@ -57,29 +57,29 @@ typedef fix_int fix_int64; } // namespace type -inline object const& operator>> (object const& o, type::fix_int8& v) +inline msgpack::object const& operator>> (msgpack::object const& o, type::fix_int8& v) { v = type::detail::convert_integer(o); return o; } -inline object const& operator>> (object const& o, type::fix_int16& v) +inline msgpack::object const& operator>> (msgpack::object const& o, type::fix_int16& v) { v = type::detail::convert_integer(o); return o; } -inline object const& operator>> (object const& o, type::fix_int32& v) +inline msgpack::object const& operator>> (msgpack::object const& o, type::fix_int32& v) { v = type::detail::convert_integer(o); return o; } -inline object const& operator>> (object const& o, type::fix_int64& v) +inline msgpack::object const& operator>> (msgpack::object const& o, type::fix_int64& v) { v = type::detail::convert_integer(o); return o; } -inline object const& operator>> (object const& o, type::fix_uint8& v) +inline msgpack::object const& operator>> (msgpack::object const& o, type::fix_uint8& v) { v = type::detail::convert_integer(o); return o; } -inline object const& operator>> (object const& o, type::fix_uint16& v) +inline msgpack::object const& operator>> (msgpack::object const& o, type::fix_uint16& v) { v = type::detail::convert_integer(o); return o; } -inline object const& operator>> (object const& o, type::fix_uint32& v) +inline msgpack::object const& operator>> (msgpack::object const& o, type::fix_uint32& v) { v = type::detail::convert_integer(o); return o; } -inline object const& operator>> (object const& o, type::fix_uint64& v) +inline msgpack::object const& operator>> (msgpack::object const& o, type::fix_uint64& v) { v = type::detail::convert_integer(o); return o; } @@ -117,92 +117,92 @@ inline packer& operator<< (packer& o, const type::fix_uint64& v) { o.pack_fix_uint64(v); return o; } -inline void operator<< (object& o, type::fix_int8 v) +inline void operator<< (msgpack::object& o, type::fix_int8 v) { if (v.get() < 0) { - o.type = type::NEGATIVE_INTEGER; + o.type = msgpack::type::NEGATIVE_INTEGER; o.via.i64 = v.get(); } else { - o.type = type::POSITIVE_INTEGER; + o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = v.get(); } } -inline void operator<< (object& o, type::fix_int16 v) +inline void operator<< (msgpack::object& o, type::fix_int16 v) { if(v.get() < 0) { - o.type = type::NEGATIVE_INTEGER; + o.type = msgpack::type::NEGATIVE_INTEGER; o.via.i64 = v.get(); } else { - o.type = type::POSITIVE_INTEGER; + o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = v.get(); } } -inline void operator<< (object& o, type::fix_int32 v) +inline void operator<< (msgpack::object& o, type::fix_int32 v) { if (v.get() < 0) { - o.type = type::NEGATIVE_INTEGER; + o.type = msgpack::type::NEGATIVE_INTEGER; o.via.i64 = v.get(); } else { - o.type = type::POSITIVE_INTEGER; + o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = v.get(); } } -inline void operator<< (object& o, type::fix_int64 v) +inline void operator<< (msgpack::object& o, type::fix_int64 v) { if (v.get() < 0) { - o.type = type::NEGATIVE_INTEGER; + o.type = msgpack::type::NEGATIVE_INTEGER; o.via.i64 = v.get(); } else { - o.type = type::POSITIVE_INTEGER; + o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = v.get(); } } -inline void operator<< (object& o, type::fix_uint8 v) - { o.type = type::POSITIVE_INTEGER, o.via.u64 = v.get(); } +inline void operator<< (msgpack::object& o, type::fix_uint8 v) + { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v.get(); } -inline void operator<< (object& o, type::fix_uint16 v) - { o.type = type::POSITIVE_INTEGER, o.via.u64 = v.get(); } +inline void operator<< (msgpack::object& o, type::fix_uint16 v) + { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v.get(); } -inline void operator<< (object& o, type::fix_uint32 v) - { o.type = type::POSITIVE_INTEGER, o.via.u64 = v.get(); } +inline void operator<< (msgpack::object& o, type::fix_uint32 v) + { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v.get(); } -inline void operator<< (object& o, type::fix_uint64 v) - { o.type = type::POSITIVE_INTEGER, o.via.u64 = v.get(); } +inline void operator<< (msgpack::object& o, type::fix_uint64 v) + { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v.get(); } -inline void operator<< (object::with_zone& o, type::fix_int8 v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, type::fix_int8 v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, type::fix_int16 v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, type::fix_int16 v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, type::fix_int32 v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, type::fix_int32 v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, type::fix_int64 v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, type::fix_int64 v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, type::fix_uint8 v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, type::fix_uint8 v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, type::fix_uint16 v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, type::fix_uint16 v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, type::fix_uint32 v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, type::fix_uint32 v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, type::fix_uint64 v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, type::fix_uint64 v) + { static_cast(o) << v; } } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/fixint_fwd.hpp b/include/msgpack/adaptor/fixint_fwd.hpp index cad85ebe..fe4dbbee 100644 --- a/include/msgpack/adaptor/fixint_fwd.hpp +++ b/include/msgpack/adaptor/fixint_fwd.hpp @@ -45,15 +45,15 @@ typedef fix_int fix_int64; } // namespace type -object const& operator>> (object const& o, type::fix_int8& v); -object const& operator>> (object const& o, type::fix_int16& v); -object const& operator>> (object const& o, type::fix_int32& v); -object const& operator>> (object const& o, type::fix_int64& v); +msgpack::object const& operator>> (msgpack::object const& o, type::fix_int8& v); +msgpack::object const& operator>> (msgpack::object const& o, type::fix_int16& v); +msgpack::object const& operator>> (msgpack::object const& o, type::fix_int32& v); +msgpack::object const& operator>> (msgpack::object const& o, type::fix_int64& v); -object const& operator>> (object const& o, type::fix_uint8& v); -object const& operator>> (object const& o, type::fix_uint16& v); -object const& operator>> (object const& o, type::fix_uint32& v); -object const& operator>> (object const& o, type::fix_uint64& v); +msgpack::object const& operator>> (msgpack::object const& o, type::fix_uint8& v); +msgpack::object const& operator>> (msgpack::object const& o, type::fix_uint16& v); +msgpack::object const& operator>> (msgpack::object const& o, type::fix_uint32& v); +msgpack::object const& operator>> (msgpack::object const& o, type::fix_uint64& v); template packer& operator<< (packer& o, const type::fix_int8& v); @@ -73,25 +73,25 @@ packer& operator<< (packer& o, const type::fix_uint32& v); template packer& operator<< (packer& o, const type::fix_uint64& v); -void operator<< (object& o, type::fix_int8 v); -void operator<< (object& o, type::fix_int16 v); -void operator<< (object& o, type::fix_int32 v); -void operator<< (object& o, type::fix_int64 v); +void operator<< (msgpack::object& o, type::fix_int8 v); +void operator<< (msgpack::object& o, type::fix_int16 v); +void operator<< (msgpack::object& o, type::fix_int32 v); +void operator<< (msgpack::object& o, type::fix_int64 v); -void operator<< (object& o, type::fix_uint8 v); -void operator<< (object& o, type::fix_uint16 v); -void operator<< (object& o, type::fix_uint32 v); -void operator<< (object& o, type::fix_uint64 v); +void operator<< (msgpack::object& o, type::fix_uint8 v); +void operator<< (msgpack::object& o, type::fix_uint16 v); +void operator<< (msgpack::object& o, type::fix_uint32 v); +void operator<< (msgpack::object& o, type::fix_uint64 v); -void operator<< (object::with_zone& o, type::fix_int8 v); -void operator<< (object::with_zone& o, type::fix_int16 v); -void operator<< (object::with_zone& o, type::fix_int32 v); -void operator<< (object::with_zone& o, type::fix_int64 v); +void operator<< (msgpack::object::with_zone& o, type::fix_int8 v); +void operator<< (msgpack::object::with_zone& o, type::fix_int16 v); +void operator<< (msgpack::object::with_zone& o, type::fix_int32 v); +void operator<< (msgpack::object::with_zone& o, type::fix_int64 v); -void operator<< (object::with_zone& o, type::fix_uint8 v); -void operator<< (object::with_zone& o, type::fix_uint16 v); -void operator<< (object::with_zone& o, type::fix_uint32 v); -void operator<< (object::with_zone& o, type::fix_uint64 v); +void operator<< (msgpack::object::with_zone& o, type::fix_uint8 v); +void operator<< (msgpack::object::with_zone& o, type::fix_uint16 v); +void operator<< (msgpack::object::with_zone& o, type::fix_uint32 v); +void operator<< (msgpack::object::with_zone& o, type::fix_uint64 v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/float.hpp b/include/msgpack/adaptor/float.hpp index aed76457..7ecadbb8 100644 --- a/include/msgpack/adaptor/float.hpp +++ b/include/msgpack/adaptor/float.hpp @@ -29,15 +29,15 @@ MSGPACK_API_VERSION_NAMESPACE(v1) { // FIXME check overflow, underflow -inline object const& operator>> (object const& o, float& v) +inline msgpack::object const& operator>> (msgpack::object const& o, float& v) { - if(o.type == type::FLOAT) { + if(o.type == msgpack::type::FLOAT) { v = static_cast(o.via.f64); } - else if (o.type == type::POSITIVE_INTEGER) { + else if (o.type == msgpack::type::POSITIVE_INTEGER) { v = static_cast(o.via.u64); } - else if (o.type == type::NEGATIVE_INTEGER) { + else if (o.type == msgpack::type::NEGATIVE_INTEGER) { v = static_cast(o.via.i64); } else { @@ -54,15 +54,15 @@ inline packer& operator<< (packer& o, const float& v) } -inline object const& operator>> (object const& o, double& v) +inline msgpack::object const& operator>> (msgpack::object const& o, double& v) { - if(o.type == type::FLOAT) { + if(o.type == msgpack::type::FLOAT) { v = o.via.f64; } - else if (o.type == type::POSITIVE_INTEGER) { + else if (o.type == msgpack::type::POSITIVE_INTEGER) { v = static_cast(o.via.u64); } - else if (o.type == type::NEGATIVE_INTEGER) { + else if (o.type == msgpack::type::NEGATIVE_INTEGER) { v = static_cast(o.via.i64); } else { @@ -79,23 +79,23 @@ inline packer& operator<< (packer& o, const double& v) } -inline void operator<< (object& o, float v) +inline void operator<< (msgpack::object& o, float v) { - o.type = type::FLOAT; + o.type = msgpack::type::FLOAT; o.via.f64 = static_cast(v); } -inline void operator<< (object& o, double v) +inline void operator<< (msgpack::object& o, double v) { - o.type = type::FLOAT; + o.type = msgpack::type::FLOAT; o.via.f64 = v; } -inline void operator<< (object::with_zone& o, float v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, float v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, double v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, double v) + { static_cast(o) << v; } } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/float_fwd.hpp b/include/msgpack/adaptor/float_fwd.hpp index 5eb9bafb..fde8816e 100644 --- a/include/msgpack/adaptor/float_fwd.hpp +++ b/include/msgpack/adaptor/float_fwd.hpp @@ -26,16 +26,16 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { -object const& operator>> (object const& o, float& v); +msgpack::object const& operator>> (msgpack::object const& o, float& v); template packer& operator<< (packer& o, const float& v); -object const& operator>> (object const& o, double& v); +msgpack::object const& operator>> (msgpack::object const& o, double& v); template packer& operator<< (packer& o, const double& v); -void operator<< (object& o, float v); -void operator<< (object& o, double v); -void operator<< (object::with_zone& o, float v); -void operator<< (object::with_zone& o, double v); +void operator<< (msgpack::object& o, float v); +void operator<< (msgpack::object& o, double v); +void operator<< (msgpack::object::with_zone& o, float v); +void operator<< (msgpack::object::with_zone& o, double v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/int.hpp b/include/msgpack/adaptor/int.hpp index 8ab9bb83..eb3d775e 100644 --- a/include/msgpack/adaptor/int.hpp +++ b/include/msgpack/adaptor/int.hpp @@ -33,12 +33,12 @@ namespace detail { template struct convert_integer_sign { - static inline T convert(object const& o) { - if(o.type == type::POSITIVE_INTEGER) { + static inline T convert(msgpack::object const& o) { + if(o.type == msgpack::type::POSITIVE_INTEGER) { if(o.via.u64 > static_cast(std::numeric_limits::max())) { throw type_error(); } return static_cast(o.via.u64); - } else if(o.type == type::NEGATIVE_INTEGER) { + } else if(o.type == msgpack::type::NEGATIVE_INTEGER) { if(o.via.i64 < static_cast(std::numeric_limits::min())) { throw type_error(); } return static_cast(o.via.i64); @@ -49,8 +49,8 @@ namespace detail { template struct convert_integer_sign { - static inline T convert(object const& o) { - if(o.type == type::POSITIVE_INTEGER) { + static inline T convert(msgpack::object const& o) { + if(o.type == msgpack::type::POSITIVE_INTEGER) { if(o.via.u64 > static_cast(std::numeric_limits::max())) { throw type_error(); } return static_cast(o.via.u64); @@ -65,7 +65,7 @@ namespace detail { }; template - static inline T convert_integer(object const& o) + static inline T convert_integer(msgpack::object const& o) { return detail::convert_integer_sign::value>::convert(o); } @@ -75,13 +75,13 @@ namespace detail { template <> struct object_char_sign { - static inline void make(object& o, char v) { + static inline void make(msgpack::object& o, char v) { if (v < 0) { - o.type = type::NEGATIVE_INTEGER; + o.type = msgpack::type::NEGATIVE_INTEGER; o.via.i64 = v; } else { - o.type = type::POSITIVE_INTEGER; + o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = v; } } @@ -89,51 +89,51 @@ namespace detail { template <> struct object_char_sign { - static inline void make(object& o, char v) { - o.type = type::POSITIVE_INTEGER, o.via.u64 = v; + static inline void make(msgpack::object& o, char v) { + o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v; } }; - static inline void object_char(object& o, char v) { + static inline void object_char(msgpack::object& o, char v) { return object_char_sign::value>::make(o, v); } } // namespace detail } // namespace type -inline object const& operator>> (object const& o, char& v) +inline msgpack::object const& operator>> (msgpack::object const& o, char& v) { v = type::detail::convert_integer(o); return o; } -inline object const& operator>> (object const& o, signed char& v) +inline msgpack::object const& operator>> (msgpack::object const& o, signed char& v) { v = type::detail::convert_integer(o); return o; } -inline object const& operator>> (object const& o, signed short& v) +inline msgpack::object const& operator>> (msgpack::object const& o, signed short& v) { v = type::detail::convert_integer(o); return o; } -inline object const& operator>> (object const& o, signed int& v) +inline msgpack::object const& operator>> (msgpack::object const& o, signed int& v) { v = type::detail::convert_integer(o); return o; } -inline object const& operator>> (object const& o, signed long& v) +inline msgpack::object const& operator>> (msgpack::object const& o, signed long& v) { v = type::detail::convert_integer(o); return o; } -inline object const& operator>> (object const& o, signed long long& v) +inline msgpack::object const& operator>> (msgpack::object const& o, signed long long& v) { v = type::detail::convert_integer(o); return o; } -inline object const& operator>> (object const& o, unsigned char& v) +inline msgpack::object const& operator>> (msgpack::object const& o, unsigned char& v) { v = type::detail::convert_integer(o); return o; } -inline object const& operator>> (object const& o, unsigned short& v) +inline msgpack::object const& operator>> (msgpack::object const& o, unsigned short& v) { v = type::detail::convert_integer(o); return o; } -inline object const& operator>> (object const& o, unsigned int& v) +inline msgpack::object const& operator>> (msgpack::object const& o, unsigned int& v) { v = type::detail::convert_integer(o); return o; } -inline object const& operator>> (object const& o, unsigned long& v) +inline msgpack::object const& operator>> (msgpack::object const& o, unsigned long& v) { v = type::detail::convert_integer(o); return o; } -inline object const& operator>> (object const& o, unsigned long long& v) +inline msgpack::object const& operator>> (msgpack::object const& o, unsigned long long& v) { v = type::detail::convert_integer(o); return o; } @@ -184,121 +184,121 @@ inline packer& operator<< (packer& o, unsigned long long v) { o.pack_unsigned_long_long(v); return o; } -inline void operator<< (object& o, char v) +inline void operator<< (msgpack::object& o, char v) { type::detail::object_char(o, v); } -inline void operator<< (object& o, signed char v) +inline void operator<< (msgpack::object& o, signed char v) { if (v < 0) { - o.type = type::NEGATIVE_INTEGER; + o.type = msgpack::type::NEGATIVE_INTEGER; o.via.i64 = v; } else { - o.type = type::POSITIVE_INTEGER; + o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = v; } } -inline void operator<< (object& o, signed short v) +inline void operator<< (msgpack::object& o, signed short v) { if (v < 0) { - o.type = type::NEGATIVE_INTEGER; + o.type = msgpack::type::NEGATIVE_INTEGER; o.via.i64 = v; } else { - o.type = type::POSITIVE_INTEGER; + o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = v; } } -inline void operator<< (object& o, signed int v) +inline void operator<< (msgpack::object& o, signed int v) { if (v < 0) { - o.type = type::NEGATIVE_INTEGER; + o.type = msgpack::type::NEGATIVE_INTEGER; o.via.i64 = v; } else { - o.type = type::POSITIVE_INTEGER; + o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = v; } } -inline void operator<< (object& o, signed long v) +inline void operator<< (msgpack::object& o, signed long v) { if (v < 0) { - o.type = type::NEGATIVE_INTEGER; + o.type = msgpack::type::NEGATIVE_INTEGER; o.via.i64 = v; } else { - o.type = type::POSITIVE_INTEGER; + o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = v; } } -inline void operator<< (object& o, signed long long v) +inline void operator<< (msgpack::object& o, signed long long v) { if (v < 0) { - o.type = type::NEGATIVE_INTEGER; + o.type = msgpack::type::NEGATIVE_INTEGER; o.via.i64 = v; } else{ - o.type = type::POSITIVE_INTEGER; + o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = v; } } -inline void operator<< (object& o, unsigned char v) - { o.type = type::POSITIVE_INTEGER, o.via.u64 = v; } +inline void operator<< (msgpack::object& o, unsigned char v) + { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v; } -inline void operator<< (object& o, unsigned short v) - { o.type = type::POSITIVE_INTEGER, o.via.u64 = v; } +inline void operator<< (msgpack::object& o, unsigned short v) + { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v; } -inline void operator<< (object& o, unsigned int v) - { o.type = type::POSITIVE_INTEGER, o.via.u64 = v; } +inline void operator<< (msgpack::object& o, unsigned int v) + { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v; } -inline void operator<< (object& o, unsigned long v) - { o.type = type::POSITIVE_INTEGER, o.via.u64 = v; } +inline void operator<< (msgpack::object& o, unsigned long v) + { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v; } -inline void operator<< (object& o, unsigned long long v) - { o.type = type::POSITIVE_INTEGER, o.via.u64 = v; } +inline void operator<< (msgpack::object& o, unsigned long long v) + { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v; } -inline void operator<< (object::with_zone& o, char v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, char v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, signed char v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, signed char v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, signed short v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, signed short v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, signed int v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, signed int v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, signed long v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, signed long v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, const signed long long& v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, const signed long long& v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, unsigned char v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, unsigned char v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, unsigned short v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, unsigned short v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, unsigned int v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, unsigned int v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, unsigned long v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, unsigned long v) + { static_cast(o) << v; } -inline void operator<< (object::with_zone& o, const unsigned long long& v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, const unsigned long long& v) + { static_cast(o) << v; } } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/int_fwd.hpp b/include/msgpack/adaptor/int_fwd.hpp index 682f6b8e..91cde52b 100644 --- a/include/msgpack/adaptor/int_fwd.hpp +++ b/include/msgpack/adaptor/int_fwd.hpp @@ -25,19 +25,19 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1){ -object const& operator>> (object const& o, char& v); +msgpack::object const& operator>> (msgpack::object const& o, char& v); -object const& operator>> (object const& o, signed char& v); -object const& operator>> (object const& o, signed short& v); -object const& operator>> (object const& o, signed int& v); -object const& operator>> (object const& o, signed long& v); -object const& operator>> (object const& o, signed long long& v); +msgpack::object const& operator>> (msgpack::object const& o, signed char& v); +msgpack::object const& operator>> (msgpack::object const& o, signed short& v); +msgpack::object const& operator>> (msgpack::object const& o, signed int& v); +msgpack::object const& operator>> (msgpack::object const& o, signed long& v); +msgpack::object const& operator>> (msgpack::object const& o, signed long long& v); -object const& operator>> (object const& o, unsigned char& v); -object const& operator>> (object const& o, unsigned short& v); -object const& operator>> (object const& o, unsigned int& v); -object const& operator>> (object const& o, unsigned long& v); -object const& operator>> (object const& o, unsigned long long& v); +msgpack::object const& operator>> (msgpack::object const& o, unsigned char& v); +msgpack::object const& operator>> (msgpack::object const& o, unsigned short& v); +msgpack::object const& operator>> (msgpack::object const& o, unsigned int& v); +msgpack::object const& operator>> (msgpack::object const& o, unsigned long& v); +msgpack::object const& operator>> (msgpack::object const& o, unsigned long long& v); template packer& operator<< (packer& o, char v); @@ -65,33 +65,33 @@ template packer& operator<< (packer& o, unsigned long long v); -void operator<< (object& o, char v); +void operator<< (msgpack::object& o, char v); -void operator<< (object& o, signed char v); -void operator<< (object& o, signed short v); -void operator<< (object& o, signed int v); -void operator<< (object& o, signed long v); -void operator<< (object& o, signed long long v); +void operator<< (msgpack::object& o, signed char v); +void operator<< (msgpack::object& o, signed short v); +void operator<< (msgpack::object& o, signed int v); +void operator<< (msgpack::object& o, signed long v); +void operator<< (msgpack::object& o, signed long long v); -void operator<< (object& o, unsigned char v); -void operator<< (object& o, unsigned short v); -void operator<< (object& o, unsigned int v); -void operator<< (object& o, unsigned long v); -void operator<< (object& o, unsigned long long v); +void operator<< (msgpack::object& o, unsigned char v); +void operator<< (msgpack::object& o, unsigned short v); +void operator<< (msgpack::object& o, unsigned int v); +void operator<< (msgpack::object& o, unsigned long v); +void operator<< (msgpack::object& o, unsigned long long v); -void operator<< (object::with_zone& o, char v); +void operator<< (msgpack::object::with_zone& o, char v); -void operator<< (object::with_zone& o, signed char v); -void operator<< (object::with_zone& o, signed short v); -void operator<< (object::with_zone& o, signed int v); -void operator<< (object::with_zone& o, signed long v); -void operator<< (object::with_zone& o, const signed long long& v); +void operator<< (msgpack::object::with_zone& o, signed char v); +void operator<< (msgpack::object::with_zone& o, signed short v); +void operator<< (msgpack::object::with_zone& o, signed int v); +void operator<< (msgpack::object::with_zone& o, signed long v); +void operator<< (msgpack::object::with_zone& o, const signed long long& v); -void operator<< (object::with_zone& o, unsigned char v); -void operator<< (object::with_zone& o, unsigned short v); -void operator<< (object::with_zone& o, unsigned int v); -void operator<< (object::with_zone& o, unsigned long v); -void operator<< (object::with_zone& o, const unsigned long long& v); +void operator<< (msgpack::object::with_zone& o, unsigned char v); +void operator<< (msgpack::object::with_zone& o, unsigned short v); +void operator<< (msgpack::object::with_zone& o, unsigned int v); +void operator<< (msgpack::object::with_zone& o, unsigned long v); +void operator<< (msgpack::object::with_zone& o, const unsigned long long& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/list.hpp b/include/msgpack/adaptor/list.hpp index 321f531b..0cabdd86 100644 --- a/include/msgpack/adaptor/list.hpp +++ b/include/msgpack/adaptor/list.hpp @@ -27,12 +27,12 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -inline object const& operator>> (object const& o, std::list& v) +inline msgpack::object const& operator>> (msgpack::object const& o, std::list& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } v.resize(o.via.array.size); - object* p = o.via.array.ptr; - object* const pend = o.via.array.ptr + o.via.array.size; + msgpack::object* p = o.via.array.ptr; + msgpack::object* const pend = o.via.array.ptr + o.via.array.size; typename std::list::iterator it = v.begin(); for(; p < pend; ++p, ++it) { p->convert(*it); @@ -52,20 +52,20 @@ inline packer& operator<< (packer& o, const std::list& v) } template -inline void operator<< (object::with_zone& o, const std::list& v) +inline void operator<< (msgpack::object::with_zone& o, const std::list& v) { - o.type = type::ARRAY; + o.type = msgpack::type::ARRAY; if(v.empty()) { o.via.array.ptr = nullptr; o.via.array.size = 0; } else { - object* p = static_cast(o.zone.allocate_align(sizeof(object)*v.size())); - object* const pend = p + v.size(); + msgpack::object* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*v.size())); + msgpack::object* const pend = p + v.size(); o.via.array.ptr = p; o.via.array.size = v.size(); typename std::list::const_iterator it(v.begin()); do { - *p = object(*it, o.zone); + *p = msgpack::object(*it, o.zone); ++p; ++it; } while(p < pend); diff --git a/include/msgpack/adaptor/list_fwd.hpp b/include/msgpack/adaptor/list_fwd.hpp index 814a21a0..0caee166 100644 --- a/include/msgpack/adaptor/list_fwd.hpp +++ b/include/msgpack/adaptor/list_fwd.hpp @@ -27,11 +27,11 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -object const& operator>> (object const& o, std::list& v); +msgpack::object const& operator>> (msgpack::object const& o, std::list& v); template packer& operator<< (packer& o, const std::list& v); template -void operator<< (object::with_zone& o, const std::list& v); +void operator<< (msgpack::object::with_zone& o, const std::list& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/map.hpp b/include/msgpack/adaptor/map.hpp index c8e5c22f..f84d5dff 100644 --- a/include/msgpack/adaptor/map.hpp +++ b/include/msgpack/adaptor/map.hpp @@ -45,12 +45,12 @@ namespace detail { template -inline object const& operator>> (object const& o, type::assoc_vector& v) +inline msgpack::object const& operator>> (msgpack::object const& o, type::assoc_vector& v) { - if(o.type != type::MAP) { throw type_error(); } + if(o.type != msgpack::type::MAP) { throw type_error(); } v.resize(o.via.map.size); - object_kv* p = o.via.map.ptr; - object_kv* const pend = o.via.map.ptr + o.via.map.size; + msgpack::object_kv* p = o.via.map.ptr; + msgpack::object_kv* const pend = o.via.map.ptr + o.via.map.size; std::pair* it(&v.front()); for(; p < pend; ++p, ++it) { p->key.convert(it->first); @@ -73,21 +73,21 @@ inline packer& operator<< (packer& o, const type::assoc_vector -inline void operator<< (object::with_zone& o, const type::assoc_vector& v) +inline void operator<< (msgpack::object::with_zone& o, const type::assoc_vector& v) { - o.type = type::MAP; + o.type = msgpack::type::MAP; if(v.empty()) { o.via.map.ptr = nullptr; o.via.map.size = 0; } else { - object_kv* p = static_cast(o.zone.allocate_align(sizeof(object_kv)*v.size())); - object_kv* const pend = p + v.size(); + msgpack::object_kv* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object_kv)*v.size())); + msgpack::object_kv* const pend = p + v.size(); o.via.map.ptr = p; o.via.map.size = v.size(); typename type::assoc_vector::const_iterator it(v.begin()); do { - p->key = object(it->first, o.zone); - p->val = object(it->second, o.zone); + p->key = msgpack::object(it->first, o.zone); + p->val = msgpack::object(it->second, o.zone); ++p; ++it; } while(p < pend); @@ -96,11 +96,11 @@ inline void operator<< (object::with_zone& o, const type::assoc_vector& v) template -inline object const& operator>> (object const& o, std::map& v) +inline msgpack::object const& operator>> (msgpack::object const& o, std::map& v) { - if(o.type != type::MAP) { throw type_error(); } - object_kv* p(o.via.map.ptr); - object_kv* const pend(o.via.map.ptr + o.via.map.size); + if(o.type != msgpack::type::MAP) { throw type_error(); } + msgpack::object_kv* p(o.via.map.ptr); + msgpack::object_kv* const pend(o.via.map.ptr + o.via.map.size); std::map tmp; for(; p != pend; ++p) { K key; @@ -131,21 +131,21 @@ inline packer& operator<< (packer& o, const std::map& v) } template -inline void operator<< (object::with_zone& o, const std::map& v) +inline void operator<< (msgpack::object::with_zone& o, const std::map& v) { - o.type = type::MAP; + o.type = msgpack::type::MAP; if(v.empty()) { o.via.map.ptr = nullptr; o.via.map.size = 0; } else { - object_kv* p = static_cast(o.zone.allocate_align(sizeof(object_kv)*v.size())); - object_kv* const pend = p + v.size(); + msgpack::object_kv* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object_kv)*v.size())); + msgpack::object_kv* const pend = p + v.size(); o.via.map.ptr = p; o.via.map.size = v.size(); typename std::map::const_iterator it(v.begin()); do { - p->key = object(it->first, o.zone); - p->val = object(it->second, o.zone); + p->key = msgpack::object(it->first, o.zone); + p->val = msgpack::object(it->second, o.zone); ++p; ++it; } while(p < pend); @@ -154,11 +154,11 @@ inline void operator<< (object::with_zone& o, const std::map& v) template -inline object const& operator>> (object const& o, std::multimap& v) +inline msgpack::object const& operator>> (msgpack::object const& o, std::multimap& v) { - if(o.type != type::MAP) { throw type_error(); } - object_kv* p(o.via.map.ptr); - object_kv* const pend(o.via.map.ptr + o.via.map.size); + if(o.type != msgpack::type::MAP) { throw type_error(); } + msgpack::object_kv* p(o.via.map.ptr); + msgpack::object_kv* const pend(o.via.map.ptr + o.via.map.size); std::multimap tmp; for(; p != pend; ++p) { std::pair value; @@ -183,21 +183,21 @@ inline packer& operator<< (packer& o, const std::multimap& } template -inline void operator<< (object::with_zone& o, const std::multimap& v) +inline void operator<< (msgpack::object::with_zone& o, const std::multimap& v) { - o.type = type::MAP; + o.type = msgpack::type::MAP; if(v.empty()) { o.via.map.ptr = nullptr; o.via.map.size = 0; } else { - object_kv* p = static_cast(o.zone.allocate_align(sizeof(object_kv)*v.size())); - object_kv* const pend = p + v.size(); + msgpack::object_kv* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object_kv)*v.size())); + msgpack::object_kv* const pend = p + v.size(); o.via.map.ptr = p; o.via.map.size = v.size(); typename std::multimap::const_iterator it(v.begin()); do { - p->key = object(it->first, o.zone); - p->val = object(it->second, o.zone); + p->key = msgpack::object(it->first, o.zone); + p->val = msgpack::object(it->second, o.zone); ++p; ++it; } while(p < pend); diff --git a/include/msgpack/adaptor/map_fwd.hpp b/include/msgpack/adaptor/map_fwd.hpp index fe5cc6b0..525729e0 100644 --- a/include/msgpack/adaptor/map_fwd.hpp +++ b/include/msgpack/adaptor/map_fwd.hpp @@ -42,25 +42,25 @@ namespace detail { template -object const& operator>> (object const& o, type::assoc_vector& v); +msgpack::object const& operator>> (msgpack::object const& o, type::assoc_vector& v); template packer& operator<< (packer& o, const type::assoc_vector& v); template -void operator<< (object::with_zone& o, const type::assoc_vector& v); +void operator<< (msgpack::object::with_zone& o, const type::assoc_vector& v); template -object const& operator>> (object const& o, std::map& v); +msgpack::object const& operator>> (msgpack::object const& o, std::map& v); template packer& operator<< (packer& o, const std::map& v); template -void operator<< (object::with_zone& o, const std::map& v); +void operator<< (msgpack::object::with_zone& o, const std::map& v); template -object const& operator>> (object const& o, std::multimap& v); +msgpack::object const& operator>> (msgpack::object const& o, std::multimap& v); template packer& operator<< (packer& o, const std::multimap& v); template -void operator<< (object::with_zone& o, const std::multimap& v); +void operator<< (msgpack::object::with_zone& o, const std::multimap& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/nil.hpp b/include/msgpack/adaptor/nil.hpp index 4b092e28..283ded76 100644 --- a/include/msgpack/adaptor/nil.hpp +++ b/include/msgpack/adaptor/nil.hpp @@ -32,9 +32,9 @@ struct nil { }; } // namespace type -inline object const& operator>> (object const& o, type::nil&) +inline msgpack::object const& operator>> (msgpack::object const& o, type::nil&) { - if(o.type != type::NIL) { throw type_error(); } + if(o.type != msgpack::type::NIL) { throw type_error(); } return o; } @@ -45,17 +45,17 @@ inline packer& operator<< (packer& o, const type::nil&) return o; } -inline void operator<< (object& o, type::nil) +inline void operator<< (msgpack::object& o, type::nil) { - o.type = type::NIL; + o.type = msgpack::type::NIL; } -inline void operator<< (object::with_zone& o, type::nil v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, type::nil v) + { static_cast(o) << v; } template <> -inline void object::as() const +inline void msgpack::object::as() const { msgpack::type::nil v; convert(v); diff --git a/include/msgpack/adaptor/nil_fwd.hpp b/include/msgpack/adaptor/nil_fwd.hpp index 80d14860..cd406272 100644 --- a/include/msgpack/adaptor/nil_fwd.hpp +++ b/include/msgpack/adaptor/nil_fwd.hpp @@ -32,17 +32,17 @@ struct nil; } // namespace type -object const& operator>> (object const& o, type::nil&); +msgpack::object const& operator>> (msgpack::object const& o, type::nil&); template packer& operator<< (packer& o, const type::nil&); -void operator<< (object& o, type::nil); +void operator<< (msgpack::object& o, type::nil); -void operator<< (object::with_zone& o, type::nil v); +void operator<< (msgpack::object::with_zone& o, type::nil v); template <> -inline void object::as() const; +inline void msgpack::object::as() const; } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/pair.hpp b/include/msgpack/adaptor/pair.hpp index 27b88fae..67a8393c 100644 --- a/include/msgpack/adaptor/pair.hpp +++ b/include/msgpack/adaptor/pair.hpp @@ -27,9 +27,9 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -inline object const& operator>> (object const& o, std::pair& v) +inline msgpack::object const& operator>> (msgpack::object const& o, std::pair& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } if(o.via.array.size != 2) { throw type_error(); } o.via.array.ptr[0].convert(v.first); o.via.array.ptr[1].convert(v.second); @@ -46,14 +46,14 @@ inline packer& operator<< (packer& o, const std::pair& v } template -inline void operator<< (object::with_zone& o, const std::pair& v) +inline void operator<< (msgpack::object::with_zone& o, const std::pair& v) { - o.type = type::ARRAY; - object* p = static_cast(o.zone.allocate_align(sizeof(object)*2)); + o.type = msgpack::type::ARRAY; + msgpack::object* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*2)); o.via.array.ptr = p; o.via.array.size = 2; - p[0] = object(v.first, o.zone); - p[1] = object(v.second, o.zone); + p[0] = msgpack::object(v.first, o.zone); + p[1] = msgpack::object(v.second, o.zone); } } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/pair_fwd.hpp b/include/msgpack/adaptor/pair_fwd.hpp index d6d84d39..878a6b63 100644 --- a/include/msgpack/adaptor/pair_fwd.hpp +++ b/include/msgpack/adaptor/pair_fwd.hpp @@ -27,13 +27,13 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -object const& operator>> (object const& o, std::pair& v); +msgpack::object const& operator>> (msgpack::object const& o, std::pair& v); template packer& operator<< (packer& o, const std::pair& v); template -void operator<< (object::with_zone& o, const std::pair& v); +void operator<< (msgpack::object::with_zone& o, const std::pair& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/raw.hpp b/include/msgpack/adaptor/raw.hpp index 590b5de7..bc2dfeab 100644 --- a/include/msgpack/adaptor/raw.hpp +++ b/include/msgpack/adaptor/raw.hpp @@ -64,31 +64,31 @@ struct raw_ref { } // namespace type -inline object const& operator>> (object const& o, type::raw_ref& v) +inline msgpack::object const& operator>> (msgpack::object const& o, msgpack::type::raw_ref& v) { - if(o.type != type::BIN) { throw type_error(); } + if(o.type != msgpack::type::BIN) { throw type_error(); } v.ptr = o.via.bin.ptr; v.size = o.via.bin.size; return o; } template -inline packer& operator<< (packer& o, const type::raw_ref& v) +inline packer& operator<< (packer& o, const msgpack::type::raw_ref& v) { o.pack_bin(v.size); o.pack_bin_body(v.ptr, v.size); return o; } -inline void operator<< (object& o, const type::raw_ref& v) +inline void operator<< (msgpack::object& o, const msgpack::type::raw_ref& v) { - o.type = type::BIN; + o.type = msgpack::type::BIN; o.via.bin.ptr = v.ptr; o.via.bin.size = v.size; } -inline void operator<< (object::with_zone& o, const type::raw_ref& v) - { static_cast(o) << v; } +inline void operator<< (msgpack::object::with_zone& o, const msgpack::type::raw_ref& v) + { static_cast(o) << v; } } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/raw_fwd.hpp b/include/msgpack/adaptor/raw_fwd.hpp index 26f83434..d9b08f1b 100644 --- a/include/msgpack/adaptor/raw_fwd.hpp +++ b/include/msgpack/adaptor/raw_fwd.hpp @@ -34,14 +34,14 @@ struct raw_ref; } // namespace type -object const& operator>> (object const& o, type::raw_ref& v); +msgpack::object const& operator>> (msgpack::object const& o, type::raw_ref& v); template packer& operator<< (packer& o, const type::raw_ref& v); -void operator<< (object& o, const type::raw_ref& v); +void operator<< (msgpack::object& o, const type::raw_ref& v); -void operator<< (object::with_zone& o, const type::raw_ref& v); +void operator<< (msgpack::object::with_zone& o, const type::raw_ref& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/set.hpp b/include/msgpack/adaptor/set.hpp index 427b52fc..9e069d97 100644 --- a/include/msgpack/adaptor/set.hpp +++ b/include/msgpack/adaptor/set.hpp @@ -28,11 +28,11 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -inline object const& operator>> (object const& o, std::set& v) +inline msgpack::object const& operator>> (msgpack::object const& o, std::set& v) { - if(o.type != type::ARRAY) { throw type_error(); } - object* p = o.via.array.ptr + o.via.array.size; - object* const pbegin = o.via.array.ptr; + if(o.type != msgpack::type::ARRAY) { throw type_error(); } + msgpack::object* p = o.via.array.ptr + o.via.array.size; + msgpack::object* const pbegin = o.via.array.ptr; std::set tmp; while(p > pbegin) { --p; @@ -54,20 +54,20 @@ inline packer& operator<< (packer& o, const std::set& v) } template -inline void operator<< (object::with_zone& o, const std::set& v) +inline void operator<< (msgpack::object::with_zone& o, const std::set& v) { - o.type = type::ARRAY; + o.type = msgpack::type::ARRAY; if(v.empty()) { o.via.array.ptr = nullptr; o.via.array.size = 0; } else { - object* p = static_cast(o.zone.allocate_align(sizeof(object)*v.size())); - object* const pend = p + v.size(); + msgpack::object* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*v.size())); + msgpack::object* const pend = p + v.size(); o.via.array.ptr = p; o.via.array.size = v.size(); typename std::set::const_iterator it(v.begin()); do { - *p = object(*it, o.zone); + *p = msgpack::object(*it, o.zone); ++p; ++it; } while(p < pend); @@ -76,11 +76,11 @@ inline void operator<< (object::with_zone& o, const std::set& v) template -inline object const& operator>> (object const& o, std::multiset& v) +inline msgpack::object const& operator>> (msgpack::object const& o, std::multiset& v) { - if(o.type != type::ARRAY) { throw type_error(); } - object* p = o.via.array.ptr + o.via.array.size; - object* const pbegin = o.via.array.ptr; + if(o.type != msgpack::type::ARRAY) { throw type_error(); } + msgpack::object* p = o.via.array.ptr + o.via.array.size; + msgpack::object* const pbegin = o.via.array.ptr; std::multiset tmp; while(p > pbegin) { --p; @@ -102,20 +102,20 @@ inline packer& operator<< (packer& o, const std::multiset& v) } template -inline void operator<< (object::with_zone& o, const std::multiset& v) +inline void operator<< (msgpack::object::with_zone& o, const std::multiset& v) { - o.type = type::ARRAY; + o.type = msgpack::type::ARRAY; if(v.empty()) { o.via.array.ptr = nullptr; o.via.array.size = 0; } else { - object* p = static_cast(o.zone.allocate_align(sizeof(object)*v.size())); - object* const pend = p + v.size(); + msgpack::object* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*v.size())); + msgpack::object* const pend = p + v.size(); o.via.array.ptr = p; o.via.array.size = v.size(); typename std::multiset::const_iterator it(v.begin()); do { - *p = object(*it, o.zone); + *p = msgpack::object(*it, o.zone); ++p; ++it; } while(p < pend); diff --git a/include/msgpack/adaptor/set_fwd.hpp b/include/msgpack/adaptor/set_fwd.hpp index ae5712f8..3cbad77a 100644 --- a/include/msgpack/adaptor/set_fwd.hpp +++ b/include/msgpack/adaptor/set_fwd.hpp @@ -28,22 +28,22 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -object const& operator>> (object const& o, std::set& v); +msgpack::object const& operator>> (msgpack::object const& o, std::set& v); template packer& operator<< (packer& o, const std::set& v); template -void operator<< (object::with_zone& o, const std::set& v); +void operator<< (msgpack::object::with_zone& o, const std::set& v); template -object const& operator>> (object const& o, std::multiset& v); +msgpack::object const& operator>> (msgpack::object const& o, std::multiset& v); template packer& operator<< (packer& o, const std::multiset& v); template -void operator<< (object::with_zone& o, const std::multiset& v); +void operator<< (msgpack::object::with_zone& o, const std::multiset& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/string.hpp b/include/msgpack/adaptor/string.hpp index 05c2867f..18d77b7d 100644 --- a/include/msgpack/adaptor/string.hpp +++ b/include/msgpack/adaptor/string.hpp @@ -26,13 +26,13 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { -inline object const& operator>> (object const& o, std::string& v) +inline msgpack::object const& operator>> (msgpack::object const& o, std::string& v) { switch (o.type) { - case type::BIN: + case msgpack::type::BIN: v.assign(o.via.bin.ptr, o.via.bin.size); break; - case type::STR: + case msgpack::type::STR: v.assign(o.via.str.ptr, o.via.str.size); break; default: @@ -50,18 +50,18 @@ inline packer& operator<< (packer& o, const std::string& v) return o; } -inline void operator<< (object::with_zone& o, const std::string& v) +inline void operator<< (msgpack::object::with_zone& o, const std::string& v) { - o.type = type::STR; + o.type = msgpack::type::STR; char* ptr = static_cast(o.zone.allocate_align(v.size())); o.via.str.ptr = ptr; o.via.str.size = static_cast(v.size()); memcpy(ptr, v.data(), v.size()); } -inline void operator<< (object& o, const std::string& v) +inline void operator<< (msgpack::object& o, const std::string& v) { - o.type = type::STR; + o.type = msgpack::type::STR; o.via.str.ptr = v.data(); o.via.str.size = static_cast(v.size()); } diff --git a/include/msgpack/adaptor/string_fwd.hpp b/include/msgpack/adaptor/string_fwd.hpp index 471654e6..574e665c 100644 --- a/include/msgpack/adaptor/string_fwd.hpp +++ b/include/msgpack/adaptor/string_fwd.hpp @@ -26,14 +26,14 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { -object const& operator>> (object const& o, std::string& v); +msgpack::object const& operator>> (msgpack::object const& o, std::string& v); template packer& operator<< (packer& o, const std::string& v); -void operator<< (object::with_zone& o, const std::string& v); +void operator<< (msgpack::object::with_zone& o, const std::string& v); -void operator<< (object& o, const std::string& v); +void operator<< (msgpack::object& o, const std::string& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/tr1/unordered_map.hpp b/include/msgpack/adaptor/tr1/unordered_map.hpp index 763d7427..e0ffd196 100644 --- a/include/msgpack/adaptor/tr1/unordered_map.hpp +++ b/include/msgpack/adaptor/tr1/unordered_map.hpp @@ -47,11 +47,11 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -inline object const& operator>> (object const& o, MSGPACK_STD_TR1::unordered_map& v) +inline msgpack::object const& operator>> (msgpack::object const& o, MSGPACK_STD_TR1::unordered_map& v) { - if(o.type != type::MAP) { throw type_error(); } - object_kv* p(o.via.map.ptr); - object_kv* const pend(o.via.map.ptr + o.via.map.size); + if(o.type != msgpack::type::MAP) { throw type_error(); } + msgpack::object_kv* p(o.via.map.ptr); + msgpack::object_kv* const pend(o.via.map.ptr + o.via.map.size); MSGPACK_STD_TR1::unordered_map tmp; for(; p != pend; ++p) { K key; @@ -75,21 +75,21 @@ inline packer& operator<< (packer& o, const MSGPACK_STD_TR1::uno } template -inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_map& v) +inline void operator<< (msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_map& v) { - o.type = type::MAP; + o.type = msgpack::type::MAP; if(v.empty()) { o.via.map.ptr = nullptr; o.via.map.size = 0; } else { - object_kv* p = static_cast(o.zone.allocate_align(sizeof(object_kv)*v.size())); - object_kv* const pend = p + v.size(); + msgpack::object_kv* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object_kv)*v.size())); + msgpack::object_kv* const pend = p + v.size(); o.via.map.ptr = p; o.via.map.size = v.size(); typename MSGPACK_STD_TR1::unordered_map::const_iterator it(v.begin()); do { - p->key = object(it->first, o.zone); - p->val = object(it->second, o.zone); + p->key = msgpack::object(it->first, o.zone); + p->val = msgpack::object(it->second, o.zone); ++p; ++it; } while(p < pend); @@ -98,11 +98,11 @@ inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_m template -inline object const& operator>> (object const& o, MSGPACK_STD_TR1::unordered_multimap& v) +inline msgpack::object const& operator>> (msgpack::object const& o, MSGPACK_STD_TR1::unordered_multimap& v) { - if(o.type != type::MAP) { throw type_error(); } - object_kv* p(o.via.map.ptr); - object_kv* const pend(o.via.map.ptr + o.via.map.size); + if(o.type != msgpack::type::MAP) { throw type_error(); } + msgpack::object_kv* p(o.via.map.ptr); + msgpack::object_kv* const pend(o.via.map.ptr + o.via.map.size); MSGPACK_STD_TR1::unordered_multimap tmp; for(; p != pend; ++p) { std::pair value; @@ -127,21 +127,21 @@ inline packer& operator<< (packer& o, const MSGPACK_STD_TR1::uno } template -inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_multimap& v) +inline void operator<< (msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_multimap& v) { - o.type = type::MAP; + o.type = msgpack::type::MAP; if(v.empty()) { o.via.map.ptr = nullptr; o.via.map.size = 0; } else { - object_kv* p = static_cast(o.zone.allocate_align(sizeof(object_kv)*v.size())); - object_kv* const pend = p + v.size(); + msgpack::object_kv* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object_kv)*v.size())); + msgpack::object_kv* const pend = p + v.size(); o.via.map.ptr = p; o.via.map.size = v.size(); typename MSGPACK_STD_TR1::unordered_multimap::const_iterator it(v.begin()); do { - p->key = object(it->first, o.zone); - p->val = object(it->second, o.zone); + p->key = msgpack::object(it->first, o.zone); + p->val = msgpack::object(it->second, o.zone); ++p; ++it; } while(p < pend); diff --git a/include/msgpack/adaptor/tr1/unordered_map_fwd.hpp b/include/msgpack/adaptor/tr1/unordered_map_fwd.hpp index c3aefde1..2c3499ec 100644 --- a/include/msgpack/adaptor/tr1/unordered_map_fwd.hpp +++ b/include/msgpack/adaptor/tr1/unordered_map_fwd.hpp @@ -47,22 +47,22 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -object const& operator>> (object const& o, MSGPACK_STD_TR1::unordered_map& v); +msgpack::object const& operator>> (msgpack::object const& o, MSGPACK_STD_TR1::unordered_map& v); template packer& operator<< (packer& o, const MSGPACK_STD_TR1::unordered_map& v); template -void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_map& v); +void operator<< (msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_map& v); template -object const& operator>> (object const& o, MSGPACK_STD_TR1::unordered_multimap& v); +msgpack::object const& operator>> (msgpack::object const& o, MSGPACK_STD_TR1::unordered_multimap& v); template packer& operator<< (packer& o, const MSGPACK_STD_TR1::unordered_multimap& v); template -void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_multimap& v); +void operator<< (msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_multimap& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/tr1/unordered_set.hpp b/include/msgpack/adaptor/tr1/unordered_set.hpp index 4542dda1..edfa242c 100644 --- a/include/msgpack/adaptor/tr1/unordered_set.hpp +++ b/include/msgpack/adaptor/tr1/unordered_set.hpp @@ -47,11 +47,11 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -inline object const& operator>> (object const& o, MSGPACK_STD_TR1::unordered_set& v) +inline msgpack::object const& operator>> (msgpack::object const& o, MSGPACK_STD_TR1::unordered_set& v) { - if(o.type != type::ARRAY) { throw type_error(); } - object* p = o.via.array.ptr + o.via.array.size; - object* const pbegin = o.via.array.ptr; + if(o.type != msgpack::type::ARRAY) { throw type_error(); } + msgpack::object* p = o.via.array.ptr + o.via.array.size; + msgpack::object* const pbegin = o.via.array.ptr; MSGPACK_STD_TR1::unordered_set tmp; while(p > pbegin) { --p; @@ -73,20 +73,20 @@ inline packer& operator<< (packer& o, const MSGPACK_STD_TR1::uno } template -inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_set& v) +inline void operator<< (msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_set& v) { - o.type = type::ARRAY; + o.type = msgpack::type::ARRAY; if(v.empty()) { o.via.array.ptr = nullptr; o.via.array.size = 0; } else { - object* p = static_cast(o.zone.allocate_align(sizeof(object)*v.size())); - object* const pend = p + v.size(); + msgpack::object* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*v.size())); + msgpack::object* const pend = p + v.size(); o.via.array.ptr = p; o.via.array.size = v.size(); typename MSGPACK_STD_TR1::unordered_set::const_iterator it(v.begin()); do { - *p = object(*it, o.zone); + *p = msgpack::object(*it, o.zone); ++p; ++it; } while(p < pend); @@ -95,11 +95,11 @@ inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_s template -inline object const& operator>> (object const& o, MSGPACK_STD_TR1::unordered_multiset& v) +inline msgpack::object const& operator>> (msgpack::object const& o, MSGPACK_STD_TR1::unordered_multiset& v) { - if(o.type != type::ARRAY) { throw type_error(); } - object* p = o.via.array.ptr + o.via.array.size; - object* const pbegin = o.via.array.ptr; + if(o.type != msgpack::type::ARRAY) { throw type_error(); } + msgpack::object* p = o.via.array.ptr + o.via.array.size; + msgpack::object* const pbegin = o.via.array.ptr; MSGPACK_STD_TR1::unordered_multiset tmp; while(p > pbegin) { --p; @@ -121,20 +121,20 @@ inline packer& operator<< (packer& o, const MSGPACK_STD_TR1::uno } template -inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_multiset& v) +inline void operator<< (msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_multiset& v) { - o.type = type::ARRAY; + o.type = msgpack::type::ARRAY; if(v.empty()) { o.via.array.ptr = nullptr; o.via.array.size = 0; } else { - object* p = static_cast(o.zone.allocate_align(sizeof(object)*v.size())); - object* const pend = p + v.size(); + msgpack::object* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*v.size())); + msgpack::object* const pend = p + v.size(); o.via.array.ptr = p; o.via.array.size = v.size(); typename MSGPACK_STD_TR1::unordered_multiset::const_iterator it(v.begin()); do { - *p = object(*it, o.zone); + *p = msgpack::object(*it, o.zone); ++p; ++it; } while(p < pend); diff --git a/include/msgpack/adaptor/tr1/unordered_set_fwd.hpp b/include/msgpack/adaptor/tr1/unordered_set_fwd.hpp index fa71e8b2..8dd9630c 100644 --- a/include/msgpack/adaptor/tr1/unordered_set_fwd.hpp +++ b/include/msgpack/adaptor/tr1/unordered_set_fwd.hpp @@ -47,22 +47,22 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -object const& operator>> (object const& o, MSGPACK_STD_TR1::unordered_set& v); +msgpack::object const& operator>> (msgpack::object const& o, MSGPACK_STD_TR1::unordered_set& v); template packer& operator<< (packer& o, const MSGPACK_STD_TR1::unordered_set& v); template -void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_set& v); +void operator<< (msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_set& v); template -object const& operator>> (object const& o, MSGPACK_STD_TR1::unordered_multiset& v); +msgpack::object const& operator>> (msgpack::object const& o, MSGPACK_STD_TR1::unordered_multiset& v); template packer& operator<< (packer& o, const MSGPACK_STD_TR1::unordered_multiset& v); template -void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_multiset& v); +void operator<< (msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_multiset& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/vector.hpp b/include/msgpack/adaptor/vector.hpp index fe643117..ebd80daa 100644 --- a/include/msgpack/adaptor/vector.hpp +++ b/include/msgpack/adaptor/vector.hpp @@ -27,13 +27,13 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -inline object const& operator>> (object const& o, std::vector& v) +inline msgpack::object const& operator>> (msgpack::object const& o, std::vector& v) { - if(o.type != type::ARRAY) { throw type_error(); } + if(o.type != msgpack::type::ARRAY) { throw type_error(); } v.resize(o.via.array.size); if(o.via.array.size > 0) { - object* p = o.via.array.ptr; - object* const pend = o.via.array.ptr + o.via.array.size; + msgpack::object* p = o.via.array.ptr; + msgpack::object* const pend = o.via.array.ptr + o.via.array.size; T* it = &v[0]; do { p->convert(*it); @@ -56,20 +56,20 @@ inline packer& operator<< (packer& o, const std::vector& v) } template -inline void operator<< (object::with_zone& o, const std::vector& v) +inline void operator<< (msgpack::object::with_zone& o, const std::vector& v) { - o.type = type::ARRAY; + o.type = msgpack::type::ARRAY; if(v.empty()) { o.via.array.ptr = nullptr; o.via.array.size = 0; } else { - object* p = static_cast(o.zone.allocate_align(sizeof(object)*v.size())); - object* const pend = p + v.size(); + msgpack::object* p = static_cast(o.zone.allocate_align(sizeof(msgpack::object)*v.size())); + msgpack::object* const pend = p + v.size(); o.via.array.ptr = p; o.via.array.size = v.size(); typename std::vector::const_iterator it(v.begin()); do { - *p = object(*it, o.zone); + *p = msgpack::object(*it, o.zone); ++p; ++it; } while(p < pend); diff --git a/include/msgpack/adaptor/vector_char.hpp b/include/msgpack/adaptor/vector_char.hpp index 4db6e94c..de569b43 100644 --- a/include/msgpack/adaptor/vector_char.hpp +++ b/include/msgpack/adaptor/vector_char.hpp @@ -26,14 +26,14 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { -inline object const& operator>> (object const& o, std::vector& v) +inline msgpack::object const& operator>> (msgpack::object const& o, std::vector& v) { switch (o.type) { - case type::BIN: + case msgpack::type::BIN: v.resize(o.via.bin.size); std::memcpy(&v.front(), o.via.bin.ptr, o.via.bin.size); break; - case type::STR: + case msgpack::type::STR: v.resize(o.via.str.size); std::memcpy(&v.front(), o.via.str.ptr, o.via.str.size); break; @@ -53,16 +53,16 @@ inline packer& operator<< (packer& o, const std::vector& v return o; } -inline void operator<< (object& o, const std::vector& v) +inline void operator<< (msgpack::object& o, const std::vector& v) { - o.type = type::BIN; + o.type = msgpack::type::BIN; o.via.bin.ptr = &v.front(); o.via.bin.size = static_cast(v.size()); } -inline void operator<< (object::with_zone& o, const std::vector& v) +inline void operator<< (msgpack::object::with_zone& o, const std::vector& v) { - o.type = type::BIN; + o.type = msgpack::type::BIN; char* ptr = static_cast(o.zone.allocate_align(v.size())); o.via.bin.ptr = ptr; o.via.bin.size = static_cast(v.size()); diff --git a/include/msgpack/adaptor/vector_char_fwd.hpp b/include/msgpack/adaptor/vector_char_fwd.hpp index 0d668efd..9c596cb1 100644 --- a/include/msgpack/adaptor/vector_char_fwd.hpp +++ b/include/msgpack/adaptor/vector_char_fwd.hpp @@ -26,14 +26,14 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { -object const& operator>> (object const& o, std::vector& v); +msgpack::object const& operator>> (msgpack::object const& o, std::vector& v); template packer& operator<< (packer& o, const std::vector& v); -void operator<< (object& o, const std::vector& v); +void operator<< (msgpack::object& o, const std::vector& v); -void operator<< (object::with_zone& o, const std::vector& v); +void operator<< (msgpack::object::with_zone& o, const std::vector& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/adaptor/vector_fwd.hpp b/include/msgpack/adaptor/vector_fwd.hpp index 1e144018..d1e2c796 100644 --- a/include/msgpack/adaptor/vector_fwd.hpp +++ b/include/msgpack/adaptor/vector_fwd.hpp @@ -27,13 +27,13 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { template -object const& operator>> (object const& o, std::vector& v); +msgpack::object const& operator>> (msgpack::object const& o, std::vector& v); template packer& operator<< (packer& o, const std::vector& v); template -void operator<< (object::with_zone& o, const std::vector& v); +void operator<< (msgpack::object::with_zone& o, const std::vector& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/object.hpp b/include/msgpack/object.hpp index 7b9280fd..06896834 100644 --- a/include/msgpack/object.hpp +++ b/include/msgpack/object.hpp @@ -81,17 +81,17 @@ struct object::implicit_type { operator T() { return obj.as(); } private: - object const& obj; + msgpack::object const& obj; }; -inline object const& operator>> (object const& o, object& v) +inline msgpack::object const& operator>> (msgpack::object const& o, msgpack::object& v) { v = o; return o; } template -inline object const& operator>> (object const& o, T& v) +inline msgpack::object const& operator>> (msgpack::object const& o, T& v) { // If you get a error 'class your_class has no member named 'msgpack_unpack', // check the following: @@ -197,25 +197,25 @@ struct packer_serializer { // serialize operator template -inline packer& operator<< (packer& o, const T& v) +inline msgpack::packer& operator<< (packer& o, const T& v) { return detail::packer_serializer::pack(o, v); } -inline void operator<< (object::with_zone& o, const object& v) +inline void operator<< (msgpack::object::with_zone& o, const msgpack::object& v) { o.type = v.type; switch(v.type) { - case type::NIL: - case type::BOOLEAN: - case type::POSITIVE_INTEGER: - case type::NEGATIVE_INTEGER: - case type::FLOAT: + case msgpack::type::NIL: + case msgpack::type::BOOLEAN: + case msgpack::type::POSITIVE_INTEGER: + case msgpack::type::NEGATIVE_INTEGER: + case msgpack::type::FLOAT: ::memcpy(&o.via, &v.via, sizeof(v.via)); return; - case type::STR: { + case msgpack::type::STR: { char* ptr = static_cast(o.zone.allocate_align(v.via.str.size)); o.via.str.ptr = ptr; o.via.str.size = v.via.str.size; @@ -223,7 +223,7 @@ inline void operator<< (object::with_zone& o, const object& v) return; } - case type::BIN: { + case msgpack::type::BIN: { char* ptr = static_cast(o.zone.allocate_align(v.via.bin.size)); o.via.bin.ptr = ptr; o.via.bin.size = v.via.bin.size; @@ -231,7 +231,7 @@ inline void operator<< (object::with_zone& o, const object& v) return; } - case type::EXT: { + case msgpack::type::EXT: { char* ptr = static_cast(o.zone.allocate_align(v.via.ext.size + 1)); o.via.ext.ptr = ptr; o.via.ext.size = v.via.ext.size; @@ -239,47 +239,47 @@ inline void operator<< (object::with_zone& o, const object& v) return; } - case type::ARRAY: + case msgpack::type::ARRAY: o.via.array.ptr = static_cast(o.zone.allocate_align(sizeof(object) * v.via.array.size)); o.via.array.size = v.via.array.size; - for (object + for (msgpack::object * po(o.via.array.ptr), * pv(v.via.array.ptr), * const pvend(v.via.array.ptr + v.via.array.size); pv < pvend; ++po, ++pv) { - new (po) object(*pv, o.zone); + new (po) msgpack::object(*pv, o.zone); } return; - case type::MAP: + case msgpack::type::MAP: o.via.map.ptr = (object_kv*)o.zone.allocate_align(sizeof(object_kv) * v.via.map.size); o.via.map.size = v.via.map.size; - for(object_kv + for(msgpack::object_kv * po(o.via.map.ptr), * pv(v.via.map.ptr), * const pvend(v.via.map.ptr + v.via.map.size); pv < pvend; ++po, ++pv) { object_kv* kv = new (po) object_kv; - new (&kv->key) object(pv->key, o.zone); - new (&kv->val) object(pv->val, o.zone); + new (&kv->key) msgpack::object(pv->key, o.zone); + new (&kv->val) msgpack::object(pv->val, o.zone); } return; default: - throw type_error(); + throw msgpack::type_error(); } } -inline void operator<< (object::with_zone& o, const object::with_zone& v) +inline void operator<< (msgpack::object::with_zone& o, const msgpack::object::with_zone& v) { - return o << static_cast(v); + return o << static_cast(v); } // deconvert operator template -inline void operator<< (object::with_zone& o, const T& v) +inline void operator<< (msgpack::object::with_zone& o, const T& v) { // If you get a error 'const class your_class has no member named 'msgpack_object', // check the following: @@ -319,53 +319,53 @@ inline void operator<< (object::with_zone& o, const T& v) template template -inline packer& packer::pack(const T& v) +inline msgpack::packer& packer::pack(const T& v) { msgpack::operator<<(*this, v); return *this; } -inline bool operator==(const object& x, const object& y) +inline bool operator==(const msgpack::object& x, const msgpack::object& y) { if(x.type != y.type) { return false; } switch(x.type) { - case type::NIL: + case msgpack::type::NIL: return true; - case type::BOOLEAN: + case msgpack::type::BOOLEAN: return x.via.boolean == y.via.boolean; - case type::POSITIVE_INTEGER: + case msgpack::type::POSITIVE_INTEGER: return x.via.u64 == y.via.u64; - case type::NEGATIVE_INTEGER: + case msgpack::type::NEGATIVE_INTEGER: return x.via.i64 == y.via.i64; - case type::FLOAT: + case msgpack::type::FLOAT: return x.via.f64 == y.via.f64; - case type::STR: + case msgpack::type::STR: return x.via.str.size == y.via.str.size && memcmp(x.via.str.ptr, y.via.str.ptr, x.via.str.size) == 0; - case type::BIN: + case msgpack::type::BIN: return x.via.bin.size == y.via.bin.size && memcmp(x.via.bin.ptr, y.via.bin.ptr, x.via.bin.size) == 0; - case type::EXT: + case msgpack::type::EXT: return x.via.ext.size == y.via.ext.size && memcmp(x.via.ext.ptr, y.via.ext.ptr, x.via.ext.size) == 0; - case type::ARRAY: + case msgpack::type::ARRAY: if(x.via.array.size != y.via.array.size) { return false; } else if(x.via.array.size == 0) { return true; } else { - object* px = x.via.array.ptr; - object* const pxend = x.via.array.ptr + x.via.array.size; - object* py = y.via.array.ptr; + msgpack::object* px = x.via.array.ptr; + msgpack::object* const pxend = x.via.array.ptr + x.via.array.size; + msgpack::object* py = y.via.array.ptr; do { if(!(*px == *py)) { return false; @@ -376,15 +376,15 @@ inline bool operator==(const object& x, const object& y) return true; } - case type::MAP: + case msgpack::type::MAP: if(x.via.map.size != y.via.map.size) { return false; } else if(x.via.map.size == 0) { return true; } else { - object_kv* px = x.via.map.ptr; - object_kv* const pxend = x.via.map.ptr + x.via.map.size; - object_kv* py = y.via.map.ptr; + msgpack::object_kv* px = x.via.map.ptr; + msgpack::object_kv* const pxend = x.via.map.ptr + x.via.map.size; + msgpack::object_kv* py = y.via.map.ptr; do { if(!(px->key == py->key) || !(px->val == py->val)) { return false; @@ -401,32 +401,32 @@ inline bool operator==(const object& x, const object& y) } template -inline bool operator==(const object& x, const T& y) +inline bool operator==(const msgpack::object& x, const T& y) try { - return x == object(y); + return x == msgpack::object(y); } catch (msgpack::type_error&) { return false; } -inline bool operator!=(const object& x, const object& y) +inline bool operator!=(const msgpack::object& x, const msgpack::object& y) { return !(x == y); } template -inline bool operator==(const T& y, const object x) +inline bool operator==(const T& y, const msgpack::object x) { return x == y; } template -inline bool operator!=(const object& x, const T& y) +inline bool operator!=(const msgpack::object& x, const T& y) { return !(x == y); } template -inline bool operator!=(const T& y, const object& x) +inline bool operator!=(const T& y, const msgpack::object& x) { return x != y; } -inline object::implicit_type object::convert() const +inline msgpack::object::implicit_type object::convert() const { - return implicit_type(*this); + return msgpack::object::implicit_type(*this); } template @@ -452,7 +452,7 @@ inline T object::as() const inline object::object() { - type = type::NIL; + type = msgpack::type::NIL; } template @@ -505,7 +505,7 @@ inline object& object::operator=(const T& v) } template -object::object(const T& v, zone& z) +object::object(const T& v, msgpack::zone& z) { with_zone oz(z); msgpack::operator<<(oz, v); @@ -514,7 +514,7 @@ object::object(const T& v, zone& z) } template -object::object(const T& v, zone* z) +object::object(const T& v, msgpack::zone* z) { with_zone oz(*z); msgpack::operator<<(oz, v); @@ -529,7 +529,7 @@ inline object::object(msgpack_object o) ::memcpy(this, &o, sizeof(o)); } -inline void operator<< (object& o, msgpack_object v) +inline void operator<< (msgpack::object& o, msgpack_object v) { // FIXME beter way? ::memcpy(&o, &v, sizeof(v)); @@ -546,35 +546,35 @@ inline object::operator msgpack_object() const // obsolete template -inline void convert(T& v, object const& o) +inline void convert(T& v, msgpack::object const& o) { o.convert(v); } // obsolete template -inline void pack(packer& o, const T& v) +inline void pack(msgpack::packer& o, const T& v) { o.pack(v); } // obsolete template -inline void pack_copy(packer& o, T v) +inline void pack_copy(msgpack::packer& o, T v) { pack(o, v); } template -inline packer& operator<< (packer& o, const object& v) +inline msgpack::packer& operator<< (msgpack::packer& o, const msgpack::object& v) { switch(v.type) { - case type::NIL: + case msgpack::type::NIL: o.pack_nil(); return o; - case type::BOOLEAN: + case msgpack::type::BOOLEAN: if(v.via.boolean) { o.pack_true(); } else { @@ -582,45 +582,45 @@ inline packer& operator<< (packer& o, const object& v) } return o; - case type::POSITIVE_INTEGER: + case msgpack::type::POSITIVE_INTEGER: o.pack_uint64(v.via.u64); return o; - case type::NEGATIVE_INTEGER: + case msgpack::type::NEGATIVE_INTEGER: o.pack_int64(v.via.i64); return o; - case type::FLOAT: + case msgpack::type::FLOAT: o.pack_double(v.via.f64); return o; - case type::STR: + case msgpack::type::STR: o.pack_str(v.via.str.size); o.pack_str_body(v.via.str.ptr, v.via.str.size); return o; - case type::BIN: + case msgpack::type::BIN: o.pack_bin(v.via.bin.size); o.pack_bin_body(v.via.bin.ptr, v.via.bin.size); return o; - case type::EXT: + case msgpack::type::EXT: o.pack_ext(v.via.ext.size, v.via.ext.type()); o.pack_ext_body(v.via.ext.data(), v.via.ext.size); return o; - case type::ARRAY: + case msgpack::type::ARRAY: o.pack_array(v.via.array.size); - for(object* p(v.via.array.ptr), + for(msgpack::object* p(v.via.array.ptr), * const pend(v.via.array.ptr + v.via.array.size); p < pend; ++p) { msgpack::operator<<(o, *p); } return o; - case type::MAP: + case msgpack::type::MAP: o.pack_map(v.via.map.size); - for(object_kv* p(v.via.map.ptr), + for(msgpack::object_kv* p(v.via.map.ptr), * const pend(v.via.map.ptr + v.via.map.size); p < pend; ++p) { msgpack::operator<<(o, p->key); @@ -634,53 +634,53 @@ inline packer& operator<< (packer& o, const object& v) } template -packer& operator<< (packer& o, const object::with_zone& v) +msgpack::packer& operator<< (msgpack::packer& o, const msgpack::object::with_zone& v) { - return o << static_cast(v); + return o << static_cast(v); } -inline std::ostream& operator<< (std::ostream& s, const object& o) +inline std::ostream& operator<< (std::ostream& s, const msgpack::object& o) { switch(o.type) { - case type::NIL: + case msgpack::type::NIL: s << "nil"; break; - case type::BOOLEAN: + case msgpack::type::BOOLEAN: s << (o.via.boolean ? "true" : "false"); break; - case type::POSITIVE_INTEGER: + case msgpack::type::POSITIVE_INTEGER: s << o.via.u64; break; - case type::NEGATIVE_INTEGER: + case msgpack::type::NEGATIVE_INTEGER: s << o.via.i64; break; - case type::FLOAT: + case msgpack::type::FLOAT: s << o.via.f64; break; - case type::STR: + case msgpack::type::STR: (s << '"').write(o.via.str.ptr, o.via.str.size) << '"'; break; - case type::BIN: + case msgpack::type::BIN: (s << '"').write(o.via.bin.ptr, o.via.bin.size) << '"'; break; - case type::EXT: + case msgpack::type::EXT: s << "EXT"; break; - case type::ARRAY: + case msgpack::type::ARRAY: s << "["; if(o.via.array.size != 0) { - object* p(o.via.array.ptr); + msgpack::object* p(o.via.array.ptr); s << *p; ++p; - for(object* const pend(o.via.array.ptr + o.via.array.size); + for(msgpack::object* const pend(o.via.array.ptr + o.via.array.size); p < pend; ++p) { s << ", " << *p; } @@ -688,13 +688,13 @@ inline std::ostream& operator<< (std::ostream& s, const object& o) s << "]"; break; - case type::MAP: + case msgpack::type::MAP: s << "{"; if(o.via.map.size != 0) { - object_kv* p(o.via.map.ptr); + msgpack::object_kv* p(o.via.map.ptr); s << p->key << "=>" << p->val; ++p; - for(object_kv* const pend(o.via.map.ptr + o.via.map.size); + for(msgpack::object_kv* const pend(o.via.map.ptr + o.via.map.size); p < pend; ++p) { s << ", " << p->key << "=>" << p->val; } diff --git a/include/msgpack/object_fwd.hpp b/include/msgpack/object_fwd.hpp index 6343d3d9..297579d8 100644 --- a/include/msgpack/object_fwd.hpp +++ b/include/msgpack/object_fwd.hpp @@ -54,12 +54,12 @@ struct object_kv; struct object_array { uint32_t size; - object* ptr; + msgpack::object* ptr; }; struct object_map { uint32_t size; - object_kv* ptr; + msgpack::object_kv* ptr; }; struct object_str { @@ -88,17 +88,17 @@ struct object { double dec; // obsolete #endif // MSGPACK_USE_LEGACY_NAME_AS_FLOAT double f64; - object_array array; - object_map map; - object_str str; - object_bin bin; - object_ext ext; + msgpack::object_array array; + msgpack::object_map map; + msgpack::object_str str; + msgpack::object_bin bin; + msgpack::object_ext ext; }; - type::object_type type; + msgpack::type::object_type type; union_type via; - bool is_nil() const { return type == type::NIL; } + bool is_nil() const { return type == msgpack::type::NIL; } template T as() const; @@ -116,11 +116,11 @@ struct object { explicit object(const T& v); template - object(const T& v, zone& z); + object(const T& v, msgpack::zone& z); // obsolete template - object(const T& v, zone* z); + object(const T& v, msgpack::zone* z); template object& operator=(const T& v); @@ -139,8 +139,8 @@ public: class type_error : public std::bad_cast { }; struct object_kv { - object key; - object val; + msgpack::object key; + msgpack::object val; }; namespace detail { @@ -148,32 +148,32 @@ template struct packer_serializer; } // namespace detail -object const& operator>> (object const& o, object& v); +msgpack::object const& operator>> (msgpack::object const& o, msgpack::object& v); template -object const& operator>> (object const& o, T& v); +msgpack::object const& operator>> (msgpack::object const& o, T& v); template -void operator<< (object::with_zone& o, const T& v); +void operator<< (msgpack::object::with_zone& o, const T& v); -void operator<< (object::with_zone& o, const object& v); +void operator<< (msgpack::object::with_zone& o, const msgpack::object& v); -void operator<< (object::with_zone& o, const object::with_zone& v); +void operator<< (msgpack::object::with_zone& o, const msgpack::object::with_zone& v); template class packer; template -packer& operator<< (packer& o, const object& v); +msgpack::packer& operator<< (msgpack::packer& o, const msgpack::object& v); template -packer& operator<< (packer& o, const object::with_zone& v); +msgpack::packer& operator<< (msgpack::packer& o, const msgpack::object::with_zone& v); template -packer& operator<< (packer& o, const T& v); +msgpack::packer& operator<< (msgpack::packer& o, const T& v); template -void operator<< (object::with_zone& o, const T& v); +void operator<< (msgpack::object::with_zone& o, const T& v); } // MSGPACK_API_VERSION_NAMESPACE(v1) diff --git a/include/msgpack/unpack.hpp b/include/msgpack/unpack.hpp index 2b6f1911..a1ce03f3 100644 --- a/include/msgpack/unpack.hpp +++ b/include/msgpack/unpack.hpp @@ -61,7 +61,7 @@ namespace msgpack { MSGPACK_API_VERSION_NAMESPACE(v1) { -typedef bool (*unpack_reference_func)(type::object_type, std::size_t, void*); +typedef bool (*unpack_reference_func)(msgpack::type::object_type, std::size_t, void*); struct unpack_error : public std::runtime_error { explicit unpack_error(const std::string& msg) @@ -197,81 +197,81 @@ private: unpack_limit m_limit; }; -inline void unpack_uint8(uint8_t d, object& o) -{ o.type = type::POSITIVE_INTEGER; o.via.u64 = d; } +inline void unpack_uint8(uint8_t d, msgpack::object& o) +{ o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = d; } -inline void unpack_uint16(uint16_t d, object& o) -{ o.type = type::POSITIVE_INTEGER; o.via.u64 = d; } +inline void unpack_uint16(uint16_t d, msgpack::object& o) +{ o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = d; } -inline void unpack_uint32(uint32_t d, object& o) -{ o.type = type::POSITIVE_INTEGER; o.via.u64 = d; } +inline void unpack_uint32(uint32_t d, msgpack::object& o) +{ o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = d; } -inline void unpack_uint64(uint64_t d, object& o) -{ o.type = type::POSITIVE_INTEGER; o.via.u64 = d; } +inline void unpack_uint64(uint64_t d, msgpack::object& o) +{ o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = d; } -inline void unpack_int8(int8_t d, object& o) -{ if(d >= 0) { o.type = type::POSITIVE_INTEGER; o.via.u64 = d; } - else { o.type = type::NEGATIVE_INTEGER; o.via.i64 = d; } } +inline void unpack_int8(int8_t d, msgpack::object& o) +{ if(d >= 0) { o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = d; } + else { o.type = msgpack::type::NEGATIVE_INTEGER; o.via.i64 = d; } } -inline void unpack_int16(int16_t d, object& o) -{ if(d >= 0) { o.type = type::POSITIVE_INTEGER; o.via.u64 = d; } - else { o.type = type::NEGATIVE_INTEGER; o.via.i64 = d; } } +inline void unpack_int16(int16_t d, msgpack::object& o) +{ if(d >= 0) { o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = d; } + else { o.type = msgpack::type::NEGATIVE_INTEGER; o.via.i64 = d; } } -inline void unpack_int32(int32_t d, object& o) -{ if(d >= 0) { o.type = type::POSITIVE_INTEGER; o.via.u64 = d; } - else { o.type = type::NEGATIVE_INTEGER; o.via.i64 = d; } } +inline void unpack_int32(int32_t d, msgpack::object& o) +{ if(d >= 0) { o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = d; } + else { o.type = msgpack::type::NEGATIVE_INTEGER; o.via.i64 = d; } } -inline void unpack_int64(int64_t d, object& o) -{ if(d >= 0) { o.type = type::POSITIVE_INTEGER; o.via.u64 = d; } - else { o.type = type::NEGATIVE_INTEGER; o.via.i64 = d; } } +inline void unpack_int64(int64_t d, msgpack::object& o) +{ if(d >= 0) { o.type = msgpack::type::POSITIVE_INTEGER; o.via.u64 = d; } + else { o.type = msgpack::type::NEGATIVE_INTEGER; o.via.i64 = d; } } -inline void unpack_float(float d, object& o) -{ o.type = type::FLOAT; o.via.f64 = d; } +inline void unpack_float(float d, msgpack::object& o) +{ o.type = msgpack::type::FLOAT; o.via.f64 = d; } -inline void unpack_double(double d, object& o) -{ o.type = type::FLOAT; o.via.f64 = d; } +inline void unpack_double(double d, msgpack::object& o) +{ o.type = msgpack::type::FLOAT; o.via.f64 = d; } -inline void unpack_nil(object& o) -{ o.type = type::NIL; } +inline void unpack_nil(msgpack::object& o) +{ o.type = msgpack::type::NIL; } -inline void unpack_true(object& o) -{ o.type = type::BOOLEAN; o.via.boolean = true; } +inline void unpack_true(msgpack::object& o) +{ o.type = msgpack::type::BOOLEAN; o.via.boolean = true; } -inline void unpack_false(object& o) -{ o.type = type::BOOLEAN; o.via.boolean = false; } +inline void unpack_false(msgpack::object& o) +{ o.type = msgpack::type::BOOLEAN; o.via.boolean = false; } struct unpack_array { - void operator()(unpack_user& u, uint32_t n, object& o) const { + void operator()(unpack_user& u, uint32_t n, msgpack::object& o) const { if (n > u.limit().array()) throw array_size_overflow("array size overflow"); - o.type = type::ARRAY; + o.type = msgpack::type::ARRAY; o.via.array.size = 0; - o.via.array.ptr = static_cast(u.zone().allocate_align(n*sizeof(object))); + o.via.array.ptr = static_cast(u.zone().allocate_align(n*sizeof(msgpack::object))); } }; -inline void unpack_array_item(object& c, object const& o) +inline void unpack_array_item(msgpack::object& c, msgpack::object const& o) { #if defined(__GNUC__) && !defined(__clang__) - std::memcpy(&c.via.array.ptr[c.via.array.size++], &o, sizeof(object)); + std::memcpy(&c.via.array.ptr[c.via.array.size++], &o, sizeof(msgpack::object)); #else /* __GNUC__ && !__clang__ */ c.via.array.ptr[c.via.array.size++] = o; #endif /* __GNUC__ && !__clang__ */ } struct unpack_map { - void operator()(unpack_user& u, uint32_t n, object& o) const { + void operator()(unpack_user& u, uint32_t n, msgpack::object& o) const { if (n > u.limit().map()) throw map_size_overflow("map size overflow"); - o.type = type::MAP; + o.type = msgpack::type::MAP; o.via.map.size = 0; - o.via.map.ptr = static_cast(u.zone().allocate_align(n*sizeof(object_kv))); + o.via.map.ptr = static_cast(u.zone().allocate_align(n*sizeof(msgpack::object_kv))); } }; -inline void unpack_map_item(object& c, object const& k, object const& v) +inline void unpack_map_item(msgpack::object& c, msgpack::object const& k, msgpack::object const& v) { #if defined(__GNUC__) && !defined(__clang__) - std::memcpy(&c.via.map.ptr[c.via.map.size].key, &k, sizeof(object)); - std::memcpy(&c.via.map.ptr[c.via.map.size].val, &v, sizeof(object)); + std::memcpy(&c.via.map.ptr[c.via.map.size].key, &k, sizeof(msgpack::object)); + std::memcpy(&c.via.map.ptr[c.via.map.size].val, &v, sizeof(msgpack::object)); #else /* __GNUC__ && !__clang__ */ c.via.map.ptr[c.via.map.size].key = k; c.via.map.ptr[c.via.map.size].val = v; @@ -279,9 +279,9 @@ inline void unpack_map_item(object& c, object const& k, object const& v) ++c.via.map.size; } -inline void unpack_str(unpack_user& u, const char* p, uint32_t l, object& o) +inline void unpack_str(unpack_user& u, const char* p, uint32_t l, msgpack::object& o) { - o.type = type::STR; + o.type = msgpack::type::STR; if (u.reference_func() && u.reference_func()(o.type, l, u.user_data())) { o.via.str.ptr = p; u.set_referenced(true); @@ -295,9 +295,9 @@ inline void unpack_str(unpack_user& u, const char* p, uint32_t l, object& o) o.via.str.size = l; } -inline void unpack_bin(unpack_user& u, const char* p, uint32_t l, object& o) +inline void unpack_bin(unpack_user& u, const char* p, uint32_t l, msgpack::object& o) { - o.type = type::BIN; + o.type = msgpack::type::BIN; if (u.reference_func() && u.reference_func()(o.type, l, u.user_data())) { o.via.bin.ptr = p; u.set_referenced(true); @@ -311,9 +311,9 @@ inline void unpack_bin(unpack_user& u, const char* p, uint32_t l, object& o) o.via.bin.size = l; } -inline void unpack_ext(unpack_user& u, const char* p, std::size_t l, object& o) +inline void unpack_ext(unpack_user& u, const char* p, std::size_t l, msgpack::object& o) { - o.type = type::EXT; + o.type = msgpack::type::EXT; if (u.reference_func() && u.reference_func()(o.type, l, u.user_data())) { o.via.ext.ptr = p; u.set_referenced(true); @@ -330,21 +330,21 @@ inline void unpack_ext(unpack_user& u, const char* p, std::size_t l, object& o) class unpack_stack { public: - object const& obj() const { return m_obj; } - object& obj() { return m_obj; } - void set_obj(object const& obj) { m_obj = obj; } + msgpack::object const& obj() const { return m_obj; } + msgpack::object& obj() { return m_obj; } + void set_obj(msgpack::object const& obj) { m_obj = obj; } std::size_t count() const { return m_count; } void set_count(std::size_t count) { m_count = count; } std::size_t decl_count() { return --m_count; } uint32_t container_type() const { return m_container_type; } void set_container_type(uint32_t container_type) { m_container_type = container_type; } - object const& map_key() const { return m_map_key; } - void set_map_key(object const& map_key) { m_map_key = map_key; } + msgpack::object const& map_key() const { return m_map_key; } + void set_map_key(msgpack::object const& map_key) { m_map_key = map_key; } private: - object m_obj; + msgpack::object m_obj; std::size_t m_count; uint32_t m_container_type; - object m_map_key; + msgpack::object m_map_key; }; inline void init_count(void* buffer) @@ -412,7 +412,7 @@ public: context(unpack_reference_func f, void* user_data, unpack_limit const& limit) :m_trail(0), m_user(f, user_data, limit), m_cs(CS_HEADER), m_top(0) { - m_stack[0].set_obj(object()); + m_stack[0].set_obj(msgpack::object()); } void init() @@ -420,10 +420,10 @@ public: m_cs = CS_HEADER; m_trail = 0; m_top = 0; - m_stack[0].set_obj(object()); + m_stack[0].set_obj(msgpack::object()); } - object const& data() const + msgpack::object const& data() const { return m_stack[0].obj(); } @@ -451,7 +451,7 @@ private: int push_aggregate( Func const& f, uint32_t container_type, - object& obj, + msgpack::object& obj, const char* load_pos, std::size_t& off) { if(m_top < MSGPACK_EMBED_STACK_SIZE /* FIXME */) { @@ -478,7 +478,7 @@ private: return 0; } - int push_item(object& obj) { + int push_item(msgpack::object& obj) { bool finish = false; while (!finish) { if(m_top == 0) { @@ -522,7 +522,7 @@ private: return 0; } - int push_proc(object& obj, std::size_t& off) { + int push_proc(msgpack::object& obj, std::size_t& off) { int ret = push_item(obj); if (ret > 0) { m_stack[0].set_obj(obj); @@ -571,7 +571,7 @@ inline int context::execute(const char* data, std::size_t len, std::size_t& off) const char* const pe = data + len; const char* n = nullptr; - object obj; + msgpack::object obj; if(m_current == pe) { off = m_current - m_start; @@ -958,13 +958,13 @@ class unpacked { public: unpacked() {} - unpacked(object const& obj, msgpack::unique_ptr z) : + unpacked(msgpack::object const& obj, msgpack::unique_ptr z) : m_obj(obj), m_zone(msgpack::move(z)) { } - void set(object const& obj) + void set(msgpack::object const& obj) { m_obj = obj; } - const object& get() const + const msgpack::object& get() const { return m_obj; } msgpack::unique_ptr& zone() @@ -974,7 +974,7 @@ public: { return m_zone; } private: - object m_obj; + msgpack::object m_obj; msgpack::unique_ptr m_zone; }; @@ -1052,10 +1052,10 @@ public: bool execute(); /*! for backward compatibility */ - object const& data(); + msgpack::object const& data(); /*! for backward compatibility */ - zone* release_zone(); + msgpack::zone* release_zone(); /*! for backward compatibility */ void reset_zone(); @@ -1084,7 +1084,7 @@ private: void expand_buffer(std::size_t size); int execute_imp(); bool flush_zone(); - static bool default_reference_func(type::object_type type, std::size_t len, void*); + static bool default_reference_func(msgpack::type::object_type type, std::size_t len, void*); private: char* m_buffer; @@ -1092,7 +1092,7 @@ private: std::size_t m_free; std::size_t m_off; std::size_t m_parsed; - msgpack::unique_ptr m_z; + msgpack::unique_ptr m_z; std::size_t m_initial_buffer_size; detail::context m_ctx; @@ -1146,23 +1146,23 @@ void unpack(unpacked& result, unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); -object unpack( - zone& z, +msgpack::object unpack( + msgpack::zone& z, const char* data, std::size_t len, std::size_t& off, bool& referenced, unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); -object unpack( - zone& z, +msgpack::object unpack( + msgpack::zone& z, const char* data, std::size_t len, std::size_t& off, unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); -object unpack( - zone& z, +msgpack::object unpack( + msgpack::zone& z, const char* data, std::size_t len, bool& referenced, unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); -object unpack( - zone& z, +msgpack::object unpack( + msgpack::zone& z, const char* data, std::size_t len, unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); @@ -1187,7 +1187,7 @@ inline unpacker::unpacker(unpack_reference_func f, void* user_data, std::size_t initial_buffer_size, unpack_limit const& limit) - :m_z(new zone), m_ctx(f, user_data, limit) + :m_z(new msgpack::zone), m_ctx(f, user_data, limit) { if(initial_buffer_size < COUNTER_SIZE) { initial_buffer_size = COUNTER_SIZE; @@ -1393,19 +1393,19 @@ inline int unpacker::execute_imp() return ret; } -inline object const& unpacker::data() +inline msgpack::object const& unpacker::data() { return m_ctx.data(); } -inline zone* unpacker::release_zone() +inline msgpack::zone* unpacker::release_zone() { if(!flush_zone()) { return nullptr; } - zone* r = new zone; - zone* old = m_z.release(); + msgpack::zone* r = new msgpack::zone; + msgpack::zone* old = m_z.release(); m_z.reset(r); m_ctx.user().set_zone(*m_z); @@ -1474,7 +1474,7 @@ namespace detail { inline unpack_return unpack_imp(const char* data, std::size_t len, std::size_t& off, - zone& result_zone, object& result, bool& referenced, + msgpack::zone& result_zone, msgpack::object& result, bool& referenced, unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()) { @@ -1523,8 +1523,8 @@ inline unpacked unpack( const char* data, std::size_t len, std::size_t& off, bool& referenced, unpack_reference_func f, void* user_data, unpack_limit const& limit) { - object obj; - msgpack::unique_ptr z(new zone); + msgpack::object obj; + msgpack::unique_ptr z(new msgpack::zone); referenced = false; unpack_return ret = detail::unpack_imp( data, len, off, *z, obj, referenced, f, user_data, limit); @@ -1574,8 +1574,8 @@ inline void unpack(unpacked& result, const char* data, std::size_t len, std::size_t& off, bool& referenced, unpack_reference_func f, void* user_data, unpack_limit const& limit) { - object obj; - msgpack::unique_ptr z(new zone); + msgpack::object obj; + msgpack::unique_ptr z(new msgpack::zone); referenced = false; unpack_return ret = detail::unpack_imp( data, len, off, *z, obj, referenced, f, user_data, limit); @@ -1623,12 +1623,12 @@ inline void unpack(unpacked& result, } -inline object unpack( - zone& z, +inline msgpack::object unpack( + msgpack::zone& z, const char* data, std::size_t len, std::size_t& off, bool& referenced, unpack_reference_func f, void* user_data, unpack_limit const& limit) { - object obj; + msgpack::object obj; referenced = false; unpack_return ret = detail::unpack_imp( data, len, off, z, obj, referenced, f, user_data, limit); @@ -1647,8 +1647,8 @@ inline object unpack( return obj; } -inline object unpack( - zone& z, +inline msgpack::object unpack( + msgpack::zone& z, const char* data, std::size_t len, std::size_t& off, unpack_reference_func f, void* user_data, unpack_limit const& limit) { @@ -1656,8 +1656,8 @@ inline object unpack( return unpack(z, data, len, off, referenced, f, user_data, limit); } -inline object unpack( - zone& z, +inline msgpack::object unpack( + msgpack::zone& z, const char* data, std::size_t len, bool& referenced, unpack_reference_func f, void* user_data, unpack_limit const& limit) { @@ -1665,8 +1665,8 @@ inline object unpack( return unpack(z, data, len, off, referenced, f, user_data, limit); } -inline object unpack( - zone& z, +inline msgpack::object unpack( + msgpack::zone& z, const char* data, std::size_t len, unpack_reference_func f, void* user_data, unpack_limit const& limit) { @@ -1689,7 +1689,7 @@ inline void unpack(unpacked* result, else unpack(*result, data, len, f, user_data, limit); } -inline bool unpacker::default_reference_func(type::object_type /*type*/, std::size_t /*len*/, void*) +inline bool unpacker::default_reference_func(msgpack::type::object_type /*type*/, std::size_t /*len*/, void*) { return true; }