Update according to new napi changes

Sampson Gao · Sampson Gao · commit f763e7cd2a92 · 2017-03-24T14:37:58.000-04:00
diff --git a/2_function_arguments/napi/addon.cc b/2_function_arguments/napi/addon.cc
@@ -4,7 +4,7 @@
 void Add(napi_env env, napi_callback_info info) {
   napi_status status;
 
-  int argc;
+  size_t argc;
   status = napi_get_cb_args_length(env, info, &argc);
   assert(status == napi_ok);
 
@@ -18,11 +18,11 @@ void Add(napi_env env, napi_callback_info info) {
   assert(status == napi_ok);
 
   napi_valuetype valuetype0;
-  status = napi_get_type_of_value(env, args[0], &valuetype0);
+  status = napi_typeof(env, args[0], &valuetype0);
   assert(status == napi_ok);
 
   napi_valuetype valuetype1;
-  status = napi_get_type_of_value(env, args[1], &valuetype1);
+  status = napi_typeof(env, args[1], &valuetype1);
   assert(status == napi_ok);
 
   if (valuetype0 != napi_number || valuetype1 != napi_number) {
diff --git a/6_object_wrap/napi/myobject.cc b/6_object_wrap/napi/myobject.cc
@@ -51,7 +51,7 @@ void MyObject::New(napi_env env, napi_callback_info info) {
     double value = 0;
 
     napi_valuetype valuetype;
-    status = napi_get_type_of_value(env, args[0], &valuetype);
+    status = napi_typeof(env, args[0], &valuetype);
     assert(status == napi_ok);
 
     if (valuetype != napi_undefined) {
@@ -82,7 +82,7 @@ void MyObject::New(napi_env env, napi_callback_info info) {
     status = napi_get_cb_args(env, info, args, 1);
     assert(status == napi_ok);
 
-    const int argc = 1;
+    const size_t argc = 1;
     napi_value argv[argc] = {args[0]};
 
     napi_value cons;
@@ -165,7 +165,7 @@ void MyObject::Multiply(napi_env env, napi_callback_info info) {
   assert(status == napi_ok);
 
   napi_valuetype valuetype;
-  status = napi_get_type_of_value(env, args[0], &valuetype);
+  status = napi_typeof(env, args[0], &valuetype);
   assert(status == napi_ok);
 
   double multiple = 1;
diff --git a/7_factory_wrap/napi/myobject.cc b/7_factory_wrap/napi/myobject.cc
@@ -39,7 +39,7 @@ void MyObject::New(napi_env env, napi_callback_info info) {
   assert(status == napi_ok);
 
   napi_valuetype valuetype;
-  status = napi_get_type_of_value(env, args[0], &valuetype);
+  status = napi_typeof(env, args[0], &valuetype);
   assert(status == napi_ok);
 
   MyObject* obj = new MyObject();
diff --git a/8_passing_wrapped/napi/myobject.cc b/8_passing_wrapped/napi/myobject.cc
@@ -34,7 +34,7 @@ void MyObject::New(napi_env env, napi_callback_info info) {
   MyObject* obj = new MyObject();
 
   napi_valuetype valuetype;
-  status = napi_get_type_of_value(env, args[0], &valuetype);
+  status = napi_typeof(env, args[0], &valuetype);
   assert(status == napi_ok);
 
   if (valuetype == napi_undefined) {
