diff --git a/generate/templates/partials/convert_from_v8.cc b/generate/templates/partials/convert_from_v8.cc index fc85edf7d..659e2fb0e 100644 --- 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 index 969e88473..bda244812 100644 --- 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 index a378f11a5..11316c51f 100644 --- 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 New(void *raw, bool selfFreeing); diff --git a/generate/templates/templates/struct_content.cc b/generate/templates/templates/struct_content.cc index e2e399d98..b6ab0f16b 100644 --- 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 {{ 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 index c1f30cc4e..d15bf677c 100644 --- 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 target); {{ cType }} *GetValue(); - {{ cType }} **GetRefValue(); void ClearValue(); static Local New(void *raw, bool selfFreeing);