Merge pull request #38 from Voxer/revert-37-revert-34-master

Revert "Revert "Upgrade to NAN v2 to support iojs 3.0""
anandsuresh · Aug 5, 2015 · 5147487 · 5147487
2 parents 3198cef + da8b8fb
commit 5147487
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 42 deletions.
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
   "main": "./sse4_crc32",
   "dependencies": {
     "bindings": "~1.2.1",
-    "nan": "^1.7.0"
+    "nan": "^2.0.0"
   },
   "devDependencies": {
     "node-gyp": "^2.0.1",

diff --git a/src/sse4_crc32.cpp b/src/sse4_crc32.cpp
@@ -206,98 +206,98 @@ uint32_t hwCrc32c(uint32_t initialCrc, const char *buf, size_t len) {
  * Returns whether or not hardware support is available for CRC calculation
  */
 NAN_METHOD(isHardwareCrcSupported) {
-    NanScope();
-    NanReturnValue(NanNew<Boolean>(isSSE42Available()));
+    Nan::HandleScope scope;
+    info.GetReturnValue().Set(Nan::New<Boolean>(isSSE42Available()));
 }
 
 
 /**
  * Calculates CRC-32C for the specified string/buffer using the lookup-table
  */
 NAN_METHOD(swCrc) {
-    NanScope();
+    Nan::HandleScope scope;
     uint32_t initCrc;
     uint32_t crc;
 
     // Ensure an argument is passed
-    if (args.Length() < 1) {
-        NanReturnValue(NanNew<Integer>(0));
-    } else if (args.Length() > 2) {
-        NanThrowTypeError("Invalid number of arguments!");
-        NanReturnUndefined();
+    if (info.Length() < 1) {
+        info.GetReturnValue().Set(Nan::New<Integer>(0));
+    } else if (info.Length() > 2) {
+        Nan::ThrowTypeError("Invalid number of arguments!");
+        return;
     }
 
     // Check for any initial CRC passed to the function
-    if (args.Length() > 1) {
-        if (!(args[1]->IsUint32())) {
-            NanThrowTypeError("Initial CRC-32 is not an integer value as expected!");
-            NanReturnUndefined();
+    if (info.Length() > 1) {
+        if (!(info[1]->IsUint32())) {
+            Nan::ThrowTypeError("Initial CRC-32 is not an integer value as expected!");
+            return;
         }
 
-        initCrc = args[1]->Uint32Value();
+        initCrc = info[1]->Uint32Value();
     } else {
         initCrc = 0;
     }
 
     // Ensure the argument is a buffer or a string
-    if (Buffer::HasInstance(args[0])) {
-        Local<Object> buf = args[0]->ToObject();
+    if (Buffer::HasInstance(info[0])) {
+        Local<Object> buf = info[0]->ToObject();
         crc = swCrc32c(initCrc, (const char *)Buffer::Data(buf), (size_t)Buffer::Length(buf));
-    } else if (args[0]->IsObject()) {
-        NanThrowTypeError("Cannot compute CRC-32 for objects!");
-        NanReturnUndefined();
+    } else if (info[0]->IsObject()) {
+        Nan::ThrowTypeError("Cannot compute CRC-32 for objects!");
+        return;
     } else {
-        Local<String> strInput = args[0]->ToString();
+        Local<String> strInput = info[0]->ToString();
         crc = swCrc32c(initCrc, (const char *)(*String::Utf8Value(strInput)), (size_t)strInput->Utf8Length());
     }
 
     // Calculate the 32-bit CRC
-    NanReturnValue(NanNew<Uint32>(crc));
+    info.GetReturnValue().Set(Nan::New<Uint32>(crc));
 }
 
 
 /**
  * Calculates CRC-32C for the specified string/buffer using Intel's SSE 4.2 instructions
  */
 NAN_METHOD(hwCrc) {
-    NanScope();
+    Nan::HandleScope scope;
     uint32_t initCrc;
     uint32_t crc;
 
     // Ensure an argument is passed
-    if (args.Length() < 1) {
-        NanReturnValue(NanNew<Integer>(0));
-    } else if (args.Length() > 2) {
-        NanThrowTypeError("Invalid number of arguments!");
-        NanReturnUndefined();
+    if (info.Length() < 1) {
+        info.GetReturnValue().Set(Nan::New<Integer>(0));
+    } else if (info.Length() > 2) {
+        Nan::ThrowTypeError("Invalid number of arguments!");
+        return;
     }
 
     // Check for any initial CRC passed to the function
-    if (args.Length() > 1) {
-        if (!(args[1]->IsUint32())) {
-            NanThrowTypeError("Initial CRC-32C is not an integer value as expected!");
-            NanReturnUndefined();
+    if (info.Length() > 1) {
+        if (!(info[1]->IsUint32())) {
+            Nan::ThrowTypeError("Initial CRC-32C is not an integer value as expected!");
+            return;
         }
 
-        initCrc = args[1]->Uint32Value();
+        initCrc = info[1]->Uint32Value();
     } else {
         initCrc = 0;
     }
 
     // Ensure the argument is a buffer or a string
-    if (node::Buffer::HasInstance(args[0])) {
-        Local<Object> buf = args[0]->ToObject();
+    if (node::Buffer::HasInstance(info[0])) {
+        Local<Object> buf = info[0]->ToObject();
         crc = hwCrc32c(initCrc, (const char *)Buffer::Data(buf), (size_t)Buffer::Length(buf));
-    } else if (args[0]->IsObject()) {
-        NanThrowTypeError("Cannot compute CRC-32C for objects!");
-        NanReturnUndefined();
+    } else if (info[0]->IsObject()) {
+        Nan::ThrowTypeError("Cannot compute CRC-32C for objects!");
+        return;
     } else {
-        Local<String> strInput = args[0]->ToString();
+        Local<String> strInput = info[0]->ToString();
         crc = hwCrc32c(initCrc, (const char *)(*String::Utf8Value(strInput)), (size_t)strInput->Utf8Length());
     }
 
     // Calculate the 32-bit CRC
-    NanReturnValue(NanNew<Uint32>(crc));
+    info.GetReturnValue().Set(Nan::New<Uint32>(crc));
 }
 
 
@@ -308,9 +308,9 @@ NAN_METHOD(hwCrc) {
 void init(Handle<Object> exports) {
     initCrcTable();
 
-    NODE_SET_METHOD(exports, "isHardwareCrcSupported", isHardwareCrcSupported);
-    NODE_SET_METHOD(exports, "swCrc", swCrc);
-    NODE_SET_METHOD(exports, "hwCrc", hwCrc);
+    Nan::SetMethod(exports, "isHardwareCrcSupported", isHardwareCrcSupported);
+    Nan::SetMethod(exports, "swCrc", swCrc);
+    Nan::SetMethod(exports, "hwCrc", hwCrc);
 }