Fix xcode vector assign error (#1)

* Fix xcode vector assign error
TryGhost · Jan 8, 2018 · 25a84c0 · 25a84c0
1 parent cd7a435
commit 25a84c0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -34,6 +34,7 @@
         }
         ]
       ],
+      'defines': [ 'NAPI_DISABLE_CPP_EXCEPTIONS' ],
       "cflags": [ "-include ../src/gcc-preinclude.h" ],
       "sources": [
         "src/database.cc",

diff --git a/package.json b/package.json
@@ -37,8 +37,8 @@
     "url": "git://github.com/mapbox/node-sqlite3.git"
   },
   "dependencies": {
-    "node-addon-api": "^1.0.0",
-    "node-pre-gyp": "^0.6.38"
+    "node-addon-api": "^1.1.0",
+    "node-pre-gyp": "^0.6.39"
   },
   "bundledDependencies": [
     "node-pre-gyp"

diff --git a/src/database.cc b/src/database.cc
@@ -111,7 +111,7 @@ Database::Database(const Napi::CallbackInfo& info) : Napi::ObjectWrap<Database>(
     Napi::Env env = info.Env();
 
     REQUIRE_ARGUMENT_STRING(0, filename);
-    int pos = 1;
+    unsigned int pos = 1;
 
     int mode;
     if (info.Length() >= pos && info[pos].IsNumber()) {

diff --git a/src/macros.h b/src/macros.h
@@ -101,10 +101,13 @@ inline Napi::String StringConcat(Napi::Value str1, Napi::Value str2) {
         argc, argv                                                             \
     );
 
+// The Mac OS compiler complains when argv is NULL unless we
+// first assign it to a locally defined variable.
 #define TRY_CATCH_CALL(context, callback, argc, argv)                          \
+    Napi::Value* passed_argv = argv;\
     std::vector<napi_value> args;\
-    if (argc != 0 && argv != NULL) {\
-      args.assign(argv, argv + argc);\
+    if ((argc != 0) && (passed_argv != NULL)) {\
+      args.assign(passed_argv, passed_argv + argc);\
     }\
     (callback).MakeCallback(Napi::Value(context), args);