remove wrapper_ from napi_wrap examples

Signed-off-by: Gabriel Schulhof <[email protected]> Fixes: nodejs#140
gabrielschulhof · Aug 5, 2020 · 16112d3 · 16112d3
1 parent adb6ab3
commit 16112d3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 21 deletions.
diff --git a/6_object_wrap/napi/myobject.cc b/6_object_wrap/napi/myobject.cc
@@ -2,11 +2,7 @@
 #include <assert.h>
 
 MyObject::MyObject(double value)
-    : value_(value), env_(nullptr), wrapper_(nullptr) {}
-
-MyObject::~MyObject() {
-  napi_delete_reference(env_, wrapper_);
-}
+    : value_(value), env_(nullptr) {}
 
 void MyObject::Destructor(napi_env env,
                           void* nativeObject,
@@ -105,7 +101,7 @@ napi_value MyObject::New(napi_env env, napi_callback_info info) {
                        reinterpret_cast<void*>(obj),
                        MyObject::Destructor,
                        nullptr,  // finalize_hint
-                       &obj->wrapper_);
+                       nullptr);
     assert(status == napi_ok);
 
     return jsthis;

diff --git a/6_object_wrap/napi/myobject.h b/6_object_wrap/napi/myobject.h
@@ -21,7 +21,6 @@ class MyObject {
 
   double value_;
   napi_env env_;
-  napi_ref wrapper_;
 };
 
 #endif  // TEST_ADDONS_NAPI_6_OBJECT_WRAP_MYOBJECT_H_
diff --git a/7_factory_wrap/napi/myobject.cc b/7_factory_wrap/napi/myobject.cc
@@ -1,11 +1,7 @@
 #include "myobject.h"
 #include <assert.h>
 
-MyObject::MyObject() : env_(nullptr), wrapper_(nullptr) {}
-
-MyObject::~MyObject() {
-  napi_delete_reference(env_, wrapper_);
-}
+MyObject::MyObject() : env_(nullptr) {}
 
 void MyObject::Destructor(napi_env env,
                           void* nativeObject,
@@ -81,7 +77,7 @@ napi_value MyObject::New(napi_env env, napi_callback_info info) {
                      reinterpret_cast<void*>(obj),
                      MyObject::Destructor,
                      nullptr, /* finalize_hint */
-                     &obj->wrapper_);
+                     nullptr);
   assert(status == napi_ok);
 
   return jsthis;

diff --git a/7_factory_wrap/napi/myobject.h b/7_factory_wrap/napi/myobject.h
@@ -20,7 +20,6 @@ class MyObject {
   static napi_value PlusOne(napi_env env, napi_callback_info info);
   double counter_;
   napi_env env_;
-  napi_ref wrapper_;
 };
 
 #endif  // TEST_ADDONS_NAPI_7_FACTORY_WRAP_MYOBJECT_H_
diff --git a/8_passing_wrapped/napi/myobject.cc b/8_passing_wrapped/napi/myobject.cc
@@ -1,11 +1,7 @@
 #include "myobject.h"
 #include <assert.h>
 
-MyObject::MyObject() : env_(nullptr), wrapper_(nullptr) {}
-
-MyObject::~MyObject() {
-  napi_delete_reference(env_, wrapper_);
-}
+MyObject::MyObject() : env_(nullptr) {}
 
 void MyObject::Destructor(napi_env env,
                           void* nativeObject,
@@ -75,7 +71,7 @@ napi_value MyObject::New(napi_env env, napi_callback_info info) {
                      reinterpret_cast<void*>(obj),
                      MyObject::Destructor,
                      nullptr,  // finalize_hint
-                     &obj->wrapper_);
+                     nullptr);
   assert(status == napi_ok);
 
   return jsthis;

diff --git a/8_passing_wrapped/napi/myobject.h b/8_passing_wrapped/napi/myobject.h
@@ -20,7 +20,6 @@ class MyObject {
   static napi_value New(napi_env env, napi_callback_info info);
   double val_;
   napi_env env_;
-  napi_ref wrapper_;
 };
 
 #endif  // TEST_ADDONS_NAPI_8_PASSING_WRAPPED_MYOBJECT_H_