From 452c698644014265336659da65aa0b7a2d22e6ed Mon Sep 17 00:00:00 2001 From: Michael Nutt Date: Fri, 16 Jan 2015 01:24:25 -0500 Subject: [PATCH 1/2] upgrade nan --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4df0f42d4..7368a9805 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "meow": "^2.0.0", "mkdirp": "^0.5.0", "mocha": "^2.0.1", - "nan": "^1.3.0", + "nan": "^1.5.1", "npmconf": "^2.1.1", "object-assign": "^2.0.0", "replace-ext": "0.0.1", From 0887f836e0f68199e2f16368296d4bb80370caaf Mon Sep 17 00:00:00 2001 From: Michael Nutt Date: Fri, 16 Jan 2015 01:41:33 -0500 Subject: [PATCH 2/2] update bindings to use NanNew for iojs --- src/binding.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/binding.cpp b/src/binding.cpp index 2e7fe9351..2d9805b18 100644 --- a/src/binding.cpp +++ b/src/binding.cpp @@ -30,8 +30,8 @@ void prepare_import_results(Local returned_value, sass_context_wrapper* c continue; Local object = Local::Cast(value); - char* path = CreateString(object->Get(String::New("file"))); - char* contents = CreateString(object->Get(String::New("contents"))); + char* path = CreateString(object->Get(NanNew("file"))); + char* contents = CreateString(object->Get(NanNew("contents"))); ctx_w->imports[i] = sass_make_import_entry(path, (!contents || contents[0] == '\0') ? 0 : strdup(contents), 0); } @@ -39,8 +39,8 @@ void prepare_import_results(Local returned_value, sass_context_wrapper* c else if (returned_value->IsObject()) { ctx_w->imports = sass_make_import_list(1); Local object = Local::Cast(returned_value); - char* path = CreateString(object->Get(String::New("file"))); - char* contents = CreateString(object->Get(String::New("contents"))); + char* path = CreateString(object->Get(NanNew("file"))); + char* contents = CreateString(object->Get(NanNew("contents"))); ctx_w->imports[0] = sass_make_import_entry(path, (!contents || contents[0] == '\0') ? 0 : strdup(contents), 0); }