From 9bd339baf8d8046db068ae47613b686ab83a1601 Mon Sep 17 00:00:00 2001
From: Takatoshi Kondo <redboltz@gmail.com>
Date: Thu, 5 Sep 2013 11:31:03 +0900
Subject: [PATCH] Restored pointer based interfaces to maintain compatibility.

---
 src/msgpack/object.hpp |  1 -
 src/msgpack/unpack.hpp | 33 ++++++++++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/msgpack/object.hpp b/src/msgpack/object.hpp
index b5bf2848..51bbd987 100644
--- a/src/msgpack/object.hpp
+++ b/src/msgpack/object.hpp
@@ -90,7 +90,6 @@ struct object {
 	template <typename T>
 	void convert(T* v) const;
 
-
 	object();
 
 	object(msgpack_object o);
diff --git a/src/msgpack/unpack.hpp b/src/msgpack/unpack.hpp
index 694b75c4..ec129f8a 100644
--- a/src/msgpack/unpack.hpp
+++ b/src/msgpack/unpack.hpp
@@ -670,25 +670,29 @@ private:
 };
 
 
-static void unpack(unpacked& result,
+inline void unpack(unpacked& result,
+		const char* data, size_t len, size_t* offset = NULL);
+inline void unpack(unpacked* result,
 		const char* data, size_t len, size_t* offset = NULL);
-
 
 // obsolete
 typedef enum {
 	UNPACK_SUCCESS				=  2,
 	UNPACK_EXTRA_BYTES			=  1,
-	UNPACK_CONTINUE				=  0,
+	UNPACK_CONTINUE			=  0,
 	UNPACK_PARSE_ERROR			= -1,
 } unpack_return;
 
 // obsolete
 static unpack_return unpack(const char* data, size_t len, size_t* off,
 		zone& z, object& result);
+static unpack_return unpack(const char* data, size_t len, size_t* off,
+		zone* z, object* result);
 
 
 // obsolete
 static object unpack(const char* data, size_t len, zone& z, size_t* off = NULL);
+static object unpack(const char* data, size_t len, zone* z, size_t* off = NULL);
 
 
 inline unpacker::unpacker(size_t initial_buffer_size)
@@ -943,7 +947,7 @@ namespace detail {
 
 inline unpack_return
 unpack_imp(const char* data, size_t len, size_t* off,
-		zone& result_zone, object& result)
+	zone& result_zone, object& result)
 {
 	size_t noff = 0;
 	if(off != NULL) { noff = *off; }
@@ -981,8 +985,9 @@ unpack_imp(const char* data, size_t len, size_t* off,
 
 } // detail
 
+// reference version
 inline void unpack(unpacked& result,
-		const char* data, size_t len, size_t* offset)
+	const char* data, size_t len, size_t* offset)
 {
 	object obj;
 	msgpack::unique_ptr<zone> z(new zone());
@@ -1010,17 +1015,30 @@ inline void unpack(unpacked& result,
 		throw unpack_error("parse error");
 	}
 }
+// pointer version
+inline void unpack(unpacked* result,
+	const char* data, size_t len, size_t* offset) {
+	unpack(*result, data, len, offset);
+}
 
 
 // obsolete
+// reference version
 inline unpack_return unpack(const char* data, size_t len, size_t* off,
 		zone& z, object& result)
 {
 	return detail::unpack_imp(data, len, off,
 			z, result);
 }
+// pointer version
+inline unpack_return unpack(const char* data, size_t len, size_t* off,
+		zone* z, object* result)
+{
+	return unpack(data, len, off, *z, *result);
+}
 
 // obsolete
+// reference version
 inline object unpack(const char* data, size_t len, zone& z, size_t* off)
 {
 	object result;
@@ -1044,6 +1062,11 @@ inline object unpack(const char* data, size_t len, zone& z, size_t* off)
 		throw unpack_error("parse error");
 	}
 }
+// pointer version
+inline object unpack(const char* data, size_t len, zone* z, size_t* off)
+{
+	return unpack(data, len, *z, off);
+}
 
 }  // namespace msgpack