Merge pull request #923 from nodegit/fix-out-values

johnhaley81 · johnhaley81 · commit 01b144f9b3ea · 2016-02-25T09:40:36.000-07:00
Remove `GetRefValue`
diff --git a/generate/templates/partials/convert_from_v8.cc b/generate/templates/partials/convert_from_v8.cc
@@ -69,18 +69,10 @@
     {%endif%}
   }
   else {
-    {%if cType|isDoublePointer %}
-    from_{{ name }} = Nan::ObjectWrap::Unwrap<{{ cppClassName }}>(info[{{ jsArg }}]->ToObject())->GetRefValue();
-    {%else%}
-    from_{{ name }} = Nan::ObjectWrap::Unwrap<{{ cppClassName }}>(info[{{ jsArg }}]->ToObject())->GetValue();
-    {%endif%}
+    {%if cType|isDoublePointer %}*{%endif%}from_{{ name }} = Nan::ObjectWrap::Unwrap<{{ cppClassName }}>(info[{{ jsArg }}]->ToObject())->GetValue();
   }
   {%else%}
-    {%if cType|isDoublePointer %}
-  from_{{ name }} = Nan::ObjectWrap::Unwrap<{{ cppClassName }}>(info[{{ jsArg }}]->ToObject())->GetRefValue();
-    {%else%}
-  from_{{ name }} = Nan::ObjectWrap::Unwrap<{{ cppClassName }}>(info[{{ jsArg }}]->ToObject())->GetValue();
-    {%endif%}
+    {%if cType|isDoublePointer %}*{%endif%}from_{{ name }} = Nan::ObjectWrap::Unwrap<{{ cppClassName }}>(info[{{ jsArg }}]->ToObject())->GetValue();
   {%endif%}
 
   {%if isBoolean %}
diff --git a/generate/templates/templates/class_content.cc b/generate/templates/templates/class_content.cc
@@ -109,10 +109,6 @@ using namespace node;
     return this->raw;
   }
 
-  {{ cType }} **{{ cppClassName }}::GetRefValue() {
-    return this->raw == NULL ? NULL : &this->raw;
-  }
-
   void {{ cppClassName }}::ClearValue() {
     this->raw = NULL;
   }
diff --git a/generate/templates/templates/class_header.h b/generate/templates/templates/class_header.h
@@ -44,7 +44,6 @@ class {{ cppClassName }} : public Nan::ObjectWrap {
 
     {%if cType%}
     {{ cType }} *GetValue();
-    {{ cType }} **GetRefValue();
     void ClearValue();
 
     static Local<v8::Value> New(void *raw, bool selfFreeing);
diff --git a/generate/templates/templates/struct_content.cc b/generate/templates/templates/struct_content.cc
@@ -62,7 +62,7 @@ using namespace std;
       {% endif %}
     {% endif %}
   {% endeach %}
-  
+
   if (this->selfFreeing) {
     free(this->raw);
   }
@@ -143,10 +143,6 @@ Local<v8::Value> {{ cppClassName }}::New(void* raw, bool selfFreeing) {
   return this->raw;
 }
 
-{{ cType }} **{{ cppClassName }}::GetRefValue() {
-  return this->raw == NULL ? NULL : &this->raw;
-}
-
 void {{ cppClassName }}::ClearValue() {
   this->raw = NULL;
 }
diff --git a/generate/templates/templates/struct_header.h b/generate/templates/templates/struct_header.h
@@ -29,7 +29,6 @@ class {{ cppClassName }} : public Nan::ObjectWrap {
     static void InitializeComponent (Local<v8::Object> target);
 
     {{ cType }} *GetValue();
-    {{ cType }} **GetRefValue();
     void ClearValue();
 
     static Local<v8::Value> New(void *raw, bool selfFreeing);

Original file line number	Diff line number	Diff line change
`@@ -109,10 +109,6 @@ using namespace node;`
`109`	`109`	`return this->raw;`
`110`	`110`	`}`
`111`	`111`
`112`		`- {{ cType }} **{{ cppClassName }}::GetRefValue() {`
`113`		`- return this->raw == NULL ? NULL : &this->raw;`
`114`		`- }`
`115`		`-`
`116`	`112`	`void {{ cppClassName }}::ClearValue() {`
`117`	`113`	`this->raw = NULL;`
`118`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ using namespace std;`
`62`	`62`	`{% endif %}`
`63`	`63`	`{% endif %}`
`64`	`64`	`{% endeach %}`
`65`		`-`
	`65`	`+`
`66`	`66`	`if (this->selfFreeing) {`
`67`	`67`	`free(this->raw);`
`68`	`68`	`}`
`@@ -143,10 +143,6 @@ Local<v8::Value> {{ cppClassName }}::New(void* raw, bool selfFreeing) {`
`143`	`143`	`return this->raw;`
`144`	`144`	`}`
`145`	`145`
`146`		`-{{ cType }} **{{ cppClassName }}::GetRefValue() {`
`147`		`- return this->raw == NULL ? NULL : &this->raw;`
`148`		`-}`
`149`		`-`
`150`	`146`	`void {{ cppClassName }}::ClearValue() {`
`151`	`147`	`this->raw = NULL;`
`152`	`148`	`}`