diff options
author | Oliver Buchtala <oliver.buchtala@googlemail.com> | 2014-05-19 11:46:21 +0200 |
---|---|---|
committer | Oliver Buchtala <oliver.buchtala@googlemail.com> | 2014-05-19 11:46:21 +0200 |
commit | 7cc617a19d2c7834ee877af920a824cd29a92a89 (patch) | |
tree | 1971b0c6bb0d83e88cbadc5620f7c69833fad53a /Lib/javascript/v8/javascriptrun.swg | |
parent | 394a8bebe7c2802cb2b10d4b302adf49997be468 (diff) | |
download | swig-7cc617a19d2c7834ee877af920a824cd29a92a89.tar.gz |
Revert "Javascript: support null pointers."
This reverts commit 11963788e0d008e1c6e997577086cd8dd584c03f.
Diffstat (limited to 'Lib/javascript/v8/javascriptrun.swg')
-rw-r--r-- | Lib/javascript/v8/javascriptrun.swg | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Lib/javascript/v8/javascriptrun.swg b/Lib/javascript/v8/javascriptrun.swg index f200f1520..2e0a46717 100644 --- a/Lib/javascript/v8/javascriptrun.swg +++ b/Lib/javascript/v8/javascriptrun.swg @@ -220,11 +220,7 @@ void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void* ptr, swig_type_info int SWIG_V8_ConvertPtr(v8::Handle<v8::Value> valRef, void** ptr, swig_type_info *info, int flags) { v8::HandleScope scope; - /* special case: JavaScript null => C NULL pointer */ - if(valRef->IsNull()) { - *ptr=0; - return SWIG_OK; - } + if(!valRef->IsObject()) { return SWIG_TypeError; } @@ -232,14 +228,10 @@ int SWIG_V8_ConvertPtr(v8::Handle<v8::Value> valRef, void** ptr, swig_type_info return SWIG_V8_ConvertInstancePtr(objRef, ptr, info, flags); } -v8::Handle<v8::Value> SWIG_V8_NewPointerObj(void *ptr, swig_type_info *info, int flags) { +v8::Handle<v8::Object> SWIG_V8_NewPointerObj(void *ptr, swig_type_info *info, int flags) { v8::HandleScope scope; v8::Handle<v8::FunctionTemplate> class_templ; - if (ptr == NULL) { - return scope.Close(v8::Null()); - } - #if (SWIG_V8_VERSION < 0x031900) if(info->clientdata != 0) { class_templ = ((SWIGV8_ClientData*) info->clientdata)->class_templ; |