fix travis and remove nullptr

mathiask88 · mathiask88 · commit 14818761784a · 2015-09-14T20:32:38.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,16 @@
 sudo: false
 
-language: node_js
+language: cpp
 
 env:
-  - CXX=g++-4.8
+  matrix:
+    - TRAVIS_NODE_VERSION="0.8"
+    - TRAVIS_NODE_VERSION="0.10"
+    - TRAVIS_NODE_VERSION="0.12"
+    - TRAVIS_NODE_VERSION="4"
+    - TRAVIS_NODE_VERSION="3"
+    - TRAVIS_NODE_VERSION="2"
+    - TRAVIS_NODE_VERSION="1"
 
 addons:
   apt:
@@ -16,17 +23,11 @@ os:
   - linux
   - osx
 
-node_js:
-  - "0.12"
-  - "0.10"
-  - "0.8"
-  - "4"
-  - "3"
-  - "2"
-  - "1"
-
 install:
-  - npm install
-
-script:
-  - npm test
+  - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
+  - npm install npm
+  - mv node_modules npm
+  - npm/.bin/npm --version
+  - if [[ $TRAVIS_OS_NAME == "linux" ]]; then export CXX=g++-4.8; fi
+  - $CXX --version
+  - npm/.bin/npm install
diff --git a/src/node_snap7_client.cpp b/src/node_snap7_client.cpp
@@ -1057,7 +1057,7 @@ void IOWorker::HandleOKCallback() {
           static_cast<char*>(pData)
         , int4 * s7client->GetByteCountFromWordLen(int5)
         , S7Client::FreeCallback,
-        nullptr).ToLocalChecked();
+        NULL).ToLocalChecked();
     } else {
       argv2[1] = Nan::Null();
       delete[] static_cast<char*>(pData);
@@ -1165,7 +1165,7 @@ void IOWorker::HandleOKCallback() {
             static_cast<char*>(pData)
           , int2
           , S7Client::FreeCallback
-          , nullptr).ToLocalChecked();
+          , NULL).ToLocalChecked();
       } else {
         argv2[1] = Nan::Null();
         delete[] static_cast<char*>(pData);
@@ -1180,7 +1180,7 @@ void IOWorker::HandleOKCallback() {
             static_cast<char*>(pData)
           , int3
           , S7Client::FreeCallback
-          , nullptr).ToLocalChecked();
+          , NULL).ToLocalChecked();
       } else {
         argv2[1] = Nan::Null();
         delete[] static_cast<char*>(pData);
@@ -1241,7 +1241,7 @@ void IOWorker::HandleOKCallback() {
             reinterpret_cast<char*>(static_cast<PS7SZL>(pData))
           , int3
           , S7Client::FreeCallbackSZL
-          , nullptr).ToLocalChecked();
+          , NULL).ToLocalChecked();
       } else {
         argv2[1] = Nan::Null();
         delete static_cast<PS7SZL>(pData);
@@ -1278,7 +1278,7 @@ NAN_METHOD(S7Client::ReadArea) {
           bufferData
         , size
         , S7Client::FreeCallback
-        , nullptr).ToLocalChecked();
+        , NULL).ToLocalChecked();
       info.GetReturnValue().Set(ret);
     } else {
       delete[] bufferData;
@@ -1438,7 +1438,7 @@ v8::Local<v8::Array> S7Client::S7DataItemToArray(
               static_cast<char*>(Items[i].pdata)
             , size
             , S7Client::FreeCallback
-            , nullptr).ToLocalChecked());
+            , NULL).ToLocalChecked());
       } else {
         delete[] static_cast<char*>(Items[i].pdata);
         Nan::Set(res_obj, Nan::New<v8::String>("Data").ToLocalChecked(), Nan::Null());
@@ -1742,7 +1742,7 @@ NAN_METHOD(S7Client::Upload) {
           bufferData
         , size
         , S7Client::FreeCallback
-        , nullptr).ToLocalChecked();
+        , NULL).ToLocalChecked();
       info.GetReturnValue().Set(ret_buf);
     } else {
       delete[] bufferData;
@@ -1775,7 +1775,7 @@ NAN_METHOD(S7Client::FullUpload) {
           bufferData
         , size
         , S7Client::FreeCallback
-        , nullptr).ToLocalChecked();
+        , NULL).ToLocalChecked();
       info.GetReturnValue().Set(ret_buf);
     } else {
       delete[] bufferData;
@@ -1846,7 +1846,7 @@ NAN_METHOD(S7Client::DBGet) {
           bufferData
         , size
         , S7Client::FreeCallback
-        , nullptr).ToLocalChecked();
+        , NULL).ToLocalChecked();
       info.GetReturnValue().Set(ret_buf);
     } else {
       delete[] bufferData;
@@ -2101,7 +2101,7 @@ NAN_METHOD(S7Client::ReadSZL) {
           reinterpret_cast<char*>(SZL)
         , size
         , S7Client::FreeCallbackSZL
-        , nullptr).ToLocalChecked();
+        , NULL).ToLocalChecked();
 
       info.GetReturnValue().Set(ret_buf);
     } else {
