Support node v0.11

hideo55 · Apr 20, 2013 · 9f832dd · 9f832dd
1 parent 200a707
commit 9f832dd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/node_kytea.cc b/src/node_kytea.cc
@@ -20,7 +20,7 @@ void NodeKytea::Init(Handle<Object> target) {
     NODE_SET_PROTOTYPE_METHOD(t, "getTags", getTags);
     NODE_SET_PROTOTYPE_METHOD(t, "getAllTags", getAllTags);
 
-    Persistent < Function > constructor = Persistent < Function > ::New(t->GetFunction());
+    Persistent < Function > constructor = Persistent < Function > ::New(__GET_ISOLATE_FOR_NEW t->GetFunction());
     target->Set(String::NewSymbol("Kytea"), constructor);
 }
 

diff --git a/src/node_kytea.h b/src/node_kytea.h
@@ -18,6 +18,14 @@
 #include <kytea/kytea-struct.h>
 #include <kytea/string-util.h>
 
+#if NODE_VERSION_AT_LEAST(0,11,0)
+#define __GET_ISOLATE_FOR_NEW v8::Isolate::GetCurrent(),
+#define __GET_ISOLATE_FOR_DISPOSE v8::Isolate::GetCurrent()
+#else
+#define __GET_ISOLATE_FOR_NEW
+#define __GET_ISOLATE_FOR_DISPOSE
+#endif
+
 namespace node_kytea {
 
 class NodeKytea: node::ObjectWrap {
@@ -46,11 +54,11 @@ class NodeKytea: node::ObjectWrap {
             status(ST_OK), kt(kt_) {
             kt->Ref();
             request.data = this;
-            callback = v8::Persistent<v8::Function>::New(cb_);
+            callback = v8::Persistent<v8::Function>::New(__GET_ISOLATE_FOR_NEW cb_);
         }
         virtual ~Baton() {
             kt->Unref();
-            callback.Dispose();
+            callback.Dispose(__GET_ISOLATE_FOR_DISPOSE);
         }
     };