Modify SWIGV8_AppendOutput to work with newer versions of node
This commit is contained in:
parent
f7756be391
commit
7005b156cc
1 changed files with 5 additions and 13 deletions
|
|
@ -684,6 +684,7 @@ SWIGV8_VALUE SWIGV8_NewPackedObj(void *data, size_t size, swig_type_info *type)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
SWIGV8_ESCAPE(obj);
|
SWIGV8_ESCAPE(obj);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#define SWIG_ConvertMember(obj, ptr, sz, ty) SWIGV8_ConvertPacked(obj, ptr, sz, ty)
|
#define SWIG_ConvertMember(obj, ptr, sz, ty) SWIGV8_ConvertPacked(obj, ptr, sz, ty)
|
||||||
|
|
@ -703,21 +704,12 @@ SWIGV8_VALUE SWIGV8_AppendOutput(SWIGV8_VALUE result, SWIGV8_VALUE obj) {
|
||||||
if (result->IsUndefined()) {
|
if (result->IsUndefined()) {
|
||||||
result = SWIGV8_ARRAY_NEW();
|
result = SWIGV8_ARRAY_NEW();
|
||||||
} else if (!result->IsArray()) {
|
} else if (!result->IsArray()) {
|
||||||
#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031903)
|
SWIGV8_ARRAY tmparr = SWIGV8_ARRAY_NEW();
|
||||||
v8::Handle<v8::Array> tmparr = SWIGV8_ARRAY_NEW();
|
SWIGV8_ARRAY_SET(tmparr, 0, result);
|
||||||
#else
|
|
||||||
v8::Local<v8::Array> tmparr = SWIGV8_ARRAY_NEW();
|
|
||||||
#endif
|
|
||||||
tmparr->Set(0, result);
|
|
||||||
result = tmparr;
|
result = tmparr;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWIGV8_ARRAY arr = SWIGV8_ARRAY::Cast(result);
|
SWIGV8_ARRAY arr = SWIGV8_ARRAY::Cast(result);
|
||||||
|
SWIGV8_ARRAY_SET(arr, arr->Length(), obj);
|
||||||
#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031903) || (SWIG_V8_VERSION < 0x0704)
|
|
||||||
arr->Set(arr->Length(), obj);
|
|
||||||
#else
|
|
||||||
SWIGV8_MAYBE_CHECK(arr->Set(SWIGV8_CURRENT_CONTEXT(), arr->Length(), obj));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
SWIGV8_ESCAPE(arr);
|
SWIGV8_ESCAPE(arr);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue