update to NODE_MODULE_M() macro

rvagg · rvagg · commit ffd8f4860b88 · 2013-01-24T13:25:23.000+11:00
diff --git a/1_hello_world/hello.cc b/1_hello_world/hello.cc
@@ -9,9 +9,9 @@ Handle<Value> Method(const Arguments& args) {
 }
 
 void init(Handle<Object> target) {
-  target->Get(String::NewSymbol("exports"))->ToObject()->Set(
+  target->Get(String::NewSymbol("exports")).As<Object>()->Set(
       String::NewSymbol("hello"),
       FunctionTemplate::New(Method)->GetFunction());
 }
 
-NODE_MODULE_INIT(hello, init)
+NODE_MODULE_M(hello, init)
diff --git a/2_function_arguments/addon.cc b/2_function_arguments/addon.cc
@@ -22,9 +22,9 @@ Handle<Value> Add(const Arguments& args) {
 }
 
 void Init(Handle<Object> target) {
-  target->Get(String::NewSymbol("exports"))->ToObject()->Set(
+  target->Get(String::NewSymbol("exports")).As<Object>()->Set(
       String::NewSymbol("add"),
       FunctionTemplate::New(Add)->GetFunction());
 }
 
-NODE_MODULE_INIT(addon, Init)
+NODE_MODULE_M(addon, Init)
diff --git a/3_callbacks/addon.cc b/3_callbacks/addon.cc
@@ -19,4 +19,4 @@ void Init(Handle<Object> target) {
       FunctionTemplate::New(RunCallback)->GetFunction());
 }
 
-NODE_MODULE_INIT(addon, Init)
+NODE_MODULE_M(addon, Init)
diff --git a/4_object_factory/addon.cc b/4_object_factory/addon.cc
@@ -17,4 +17,4 @@ void Init(Handle<Object> target) {
       FunctionTemplate::New(CreateObject)->GetFunction());
 }
 
-NODE_MODULE_INIT(addon, Init)
+NODE_MODULE_M(addon, Init)
diff --git a/5_function_factory/addon.cc b/5_function_factory/addon.cc
@@ -23,4 +23,4 @@ void Init(Handle<Object> target) {
       FunctionTemplate::New(CreateFunction)->GetFunction());
 }
 
-NODE_MODULE_INIT(addon, Init)
+NODE_MODULE_M(addon, Init)
diff --git a/6_object_wrap/addon.cc b/6_object_wrap/addon.cc
@@ -8,4 +8,4 @@ void InitAll(Handle<Object> target) {
   MyObject::Init(target);
 }
 
-NODE_MODULE_INIT(addon, InitAll)
+NODE_MODULE_M(addon, InitAll)
diff --git a/6_object_wrap/myobject.cc b/6_object_wrap/myobject.cc
@@ -17,7 +17,7 @@ void MyObject::Init(Handle<Object> target) {
       FunctionTemplate::New(PlusOne)->GetFunction());
 
   Persistent<Function> constructor = Persistent<Function>::New(tpl->GetFunction());
-  target->Get(String::NewSymbol("exports"))->ToObject()->Set(
+  target->Get(String::NewSymbol("exports")).As<Object>()->Set(
       String::NewSymbol("MyObject"),
       constructor);
 }
diff --git a/7_factory_wrap/addon.cc b/7_factory_wrap/addon.cc
@@ -16,4 +16,4 @@ void InitAll(Handle<Object> target) {
       FunctionTemplate::New(CreateObject)->GetFunction());
 }
 
-NODE_MODULE_INIT(addon, InitAll)
+NODE_MODULE_M(addon, InitAll)
diff --git a/8_passing_wrapped/addon.cc b/8_passing_wrapped/addon.cc
@@ -24,13 +24,13 @@ Handle<Value> Add(const Arguments& args) {
 void InitAll(Handle<Object> target) {
   MyObject::Init();
 
-  target->Get(String::NewSymbol("exports"))->ToObject()->Set(
+  target->Get(String::NewSymbol("exports")).As<Object>()->Set(
       String::NewSymbol("createObject"),
       FunctionTemplate::New(CreateObject)->GetFunction());
 
-  target->Get(String::NewSymbol("exports"))->ToObject()->Set(
+  target->Get(String::NewSymbol("exports")).As<Object>()->Set(
       String::NewSymbol("add"),
       FunctionTemplate::New(Add)->GetFunction());
 }
 
-NODE_MODULE_INIT(addon, InitAll)
+NODE_MODULE_M(addon, InitAll)

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ Handle<Value> Method(const Arguments& args) {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`void init(Handle<Object> target) {`
`12`		`- target->Get(String::NewSymbol("exports"))->ToObject()->Set(`
	`12`	`+ target->Get(String::NewSymbol("exports")).As<Object>()->Set(`
`13`	`13`	`String::NewSymbol("hello"),`
`14`	`14`	`FunctionTemplate::New(Method)->GetFunction());`
`15`	`15`	`}`
`16`	`16`
`17`		`-NODE_MODULE_INIT(hello, init)`
	`17`	`+NODE_MODULE_M(hello, init)`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ Handle<Value> Add(const Arguments& args) {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`void Init(Handle<Object> target) {`
`25`		`- target->Get(String::NewSymbol("exports"))->ToObject()->Set(`
	`25`	`+ target->Get(String::NewSymbol("exports")).As<Object>()->Set(`
`26`	`26`	`String::NewSymbol("add"),`
`27`	`27`	`FunctionTemplate::New(Add)->GetFunction());`
`28`	`28`	`}`
`29`	`29`
`30`		`-NODE_MODULE_INIT(addon, Init)`
	`30`	`+NODE_MODULE_M(addon, Init)`
Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,4 @@ void Init(Handle<Object> target) {`
`19`	`19`	`FunctionTemplate::New(RunCallback)->GetFunction());`
`20`	`20`	`}`
`21`	`21`
`22`		`-NODE_MODULE_INIT(addon, Init)`
	`22`	`+NODE_MODULE_M(addon, Init)`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,4 @@ void Init(Handle<Object> target) {`
`17`	`17`	`FunctionTemplate::New(CreateObject)->GetFunction());`
`18`	`18`	`}`
`19`	`19`
`20`		`-NODE_MODULE_INIT(addon, Init)`
	`20`	`+NODE_MODULE_M(addon, Init)`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,4 @@ void Init(Handle<Object> target) {`
`23`	`23`	`FunctionTemplate::New(CreateFunction)->GetFunction());`
`24`	`24`	`}`
`25`	`25`
`26`		`-NODE_MODULE_INIT(addon, Init)`
	`26`	`+NODE_MODULE_M(addon, Init)`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@ void InitAll(Handle<Object> target) {`
`8`	`8`	`MyObject::Init(target);`
`9`	`9`	`}`
`10`	`10`
`11`		`-NODE_MODULE_INIT(addon, InitAll)`
	`11`	`+NODE_MODULE_M(addon, InitAll)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ void MyObject::Init(Handle<Object> target) {`
`17`	`17`	`FunctionTemplate::New(PlusOne)->GetFunction());`
`18`	`18`
`19`	`19`	`Persistent<Function> constructor = Persistent<Function>::New(tpl->GetFunction());`
`20`		`- target->Get(String::NewSymbol("exports"))->ToObject()->Set(`
	`20`	`+ target->Get(String::NewSymbol("exports")).As<Object>()->Set(`
`21`	`21`	`String::NewSymbol("MyObject"),`
`22`	`22`	`constructor);`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,4 @@ void InitAll(Handle<Object> target) {`
`16`	`16`	`FunctionTemplate::New(CreateObject)->GetFunction());`
`17`	`17`	`}`
`18`	`18`
`19`		`-NODE_MODULE_INIT(addon, InitAll)`
	`19`	`+NODE_MODULE_M(addon, InitAll)`