mirror of
https://github.com/msgpack/msgpack-c.git
synced 2025-10-19 04:33:27 +02:00
Merge pull request #676 from redboltz/remove_object_pack_recursion
Removed recursion from msgpack::object packing and stringize.
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -83,6 +83,13 @@ bool operator!=(const T& y, const msgpack::object& x);
|
|||||||
|
|
||||||
void operator<< (msgpack::object& o, const msgpack_object& v);
|
void operator<< (msgpack::object& o, const msgpack_object& v);
|
||||||
|
|
||||||
|
class object_parser;
|
||||||
|
|
||||||
|
template <typename Stream>
|
||||||
|
struct object_pack_visitor;
|
||||||
|
|
||||||
|
struct object_stringize_visitor;
|
||||||
|
|
||||||
// obsolete
|
// obsolete
|
||||||
template <typename T>
|
template <typename T>
|
||||||
MSGPACK_DEPRECATED("please use member function version of object::convert(T&)")
|
MSGPACK_DEPRECATED("please use member function version of object::convert(T&)")
|
||||||
@@ -104,7 +111,7 @@ msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const msgpack::
|
|||||||
template <typename Stream>
|
template <typename Stream>
|
||||||
msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const msgpack::object::with_zone& v);
|
msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const msgpack::object::with_zone& v);
|
||||||
|
|
||||||
std::ostream& operator<< (std::ostream& s, const msgpack::object& o);
|
std::ostream& operator<< (std::ostream& s, const msgpack::object& v);
|
||||||
|
|
||||||
/// @cond
|
/// @cond
|
||||||
} // MSGPACK_API_VERSION_NAMESPACE(v1)
|
} // MSGPACK_API_VERSION_NAMESPACE(v1)
|
||||||
|
@@ -37,6 +37,10 @@ using v1::detail::packer_serializer;
|
|||||||
|
|
||||||
} // namespace detail
|
} // namespace detail
|
||||||
|
|
||||||
|
using v1::object_parser;
|
||||||
|
using v1::object_pack_visitor;
|
||||||
|
using v1::object_stringize_visitor;
|
||||||
|
|
||||||
using v1::operator==;
|
using v1::operator==;
|
||||||
using v1::operator!=;
|
using v1::operator!=;
|
||||||
|
|
||||||
|
@@ -37,6 +37,10 @@ using v2::detail::packer_serializer;
|
|||||||
|
|
||||||
} // namespace detail
|
} // namespace detail
|
||||||
|
|
||||||
|
using v2::object_parser;
|
||||||
|
using v2::object_pack_visitor;
|
||||||
|
using v2::object_stringize_visitor;
|
||||||
|
|
||||||
using v2::operator==;
|
using v2::operator==;
|
||||||
using v2::operator!=;
|
using v2::operator!=;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user