1 files changed, 29 insertions, 30 deletions

diff --git a/cpp/zone.hpp.erb b/cpp/zone.hpp.erb
index c0eb2e3..06cb9d3 100644
--- a/cpp/zone.hpp.erb
+++ b/cpp/zone.hpp.erb
@@ -19,17 +19,15 @@
 #define MSGPACK_ZONE_HPP__
 
 #include "msgpack/object.hpp"
+#include "msgpack/zone.h"
 #include <cstdlib>
 #include <vector>
 
-#ifndef MSGPACK_ZONE_CHUNK_SIZE
-#define MSGPACK_ZONE_CHUNK_SIZE 2048
-#endif
 <% GENERATION_LIMIT = 15 %>
 namespace msgpack {
 
 
-class zone {
+class zone : public msgpack_zone {
 public:
 	zone(size_t chunk_size = MSGPACK_ZONE_CHUNK_SIZE);
 	~zone();
@@ -37,11 +35,7 @@ public:
 public:
 	void* malloc(size_t size);
 
-	void push_finalizer(void (*func)(void*), void* obj);
-
-	void clear();
-
-	bool empty() const;
+	void push_finalizer(void (*func)(void*), void* data);
 
 	<%0.upto(GENERATION_LIMIT) {|i|%>
 	template <typename T<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
@@ -49,35 +43,39 @@ public:
 	<%}%>
 
 private:
-	struct chunk {
-		size_t free;
-		void* ptr;
-		void* alloc;
-	};
-
-	std::vector<chunk> m_chunk_array;
-
-	struct finalizer {
-		void (*func)(void*);
-		void* obj;
-	};
-
-	std::vector<finalizer> m_finalizers;
-
 	template <typename T>
 	static void object_destructor(void* obj);
 
-	size_t m_chunk_size;
-
 private:
 	zone(const zone&);
 };
 
 
-inline void zone::push_finalizer(void (*func)(void*), void* obj)
+
+inline zone::zone(size_t chunk_size)
+{
+	msgpack_zone_init(this, chunk_size);
+}
+
+inline zone::~zone()
+{
+	msgpack_zone_destroy(this);
+}
+
+inline void* zone::malloc(size_t size)
+{
+	void* ptr = msgpack_zone_malloc(this, size);
+	if(!ptr) {
+		throw std::bad_alloc();
+	}
+	return ptr;
+}
+
+inline void zone::push_finalizer(void (*func)(void*), void* data)
 {
-	finalizer f = {func, obj};
-	m_finalizers.push_back(f);
+	if(!msgpack_zone_push_finalizer(this, func, data)) {
+		throw std::bad_alloc();
+	}
 }
 
 template <typename T>
@@ -93,7 +91,7 @@ T* zone::allocate(<%=(1..i).map{|j|"A#{j} a#{j}"}.join(', ')%>)
 	void* x = malloc(sizeof(T));
 	push_finalizer(&zone::object_destructor<T>, x);
 	try { return new (x) T(<%=(1..i).map{|j|"a#{j}"}.join(', ')%>); }
-	catch (...) { m_finalizers.pop_back(); throw; }
+	catch (...) { --finalizer_array.tail; throw; }
 }
 <%}%>
 
@@ -101,3 +99,4 @@ T* zone::allocate(<%=(1..i).map{|j|"A#{j} a#{j}"}.join(', ')%>)
 
 #endif /* msgpack/zone.hpp */
 
+// vim: ft=cpp ts=4 sw=4 softtabstop=4 noexpandtab smarttab