jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for v8 3.24.3 (0x032403)

Browse source
This commit is contained in:
Richard 2014-08-22 18:54:12 -05:00
commit d4920591d4
3 changed files with 93 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Tools/javascript/v8_shell.cxx
View file

@ -32,7 +32,7 @@ typedef v8::PropertyCallbackInfo<v8::Value> SwigV8PropertyCallbackInfo;
#define SWIGV8_HANDLESCOPE() v8::HandleScope scope
#define SWIGV8_HANDLESCOPE_ESC() v8::HandleScope scope
#define SWIGV8_ESCAPE(val) return scope.Close(val)
#elif (SWIG_V8_VERSION < 0x032440)
#elif (SWIG_V8_VERSION < 0x032318)
#define SWIGV8_HANDLESCOPE() v8::HandleScope scope(v8::Isolate::GetCurrent());
#define SWIGV8_HANDLESCOPE_ESC() v8::HandleScope scope(v8::Isolate::GetCurrent());
#define SWIGV8_ESCAPE(val) return scope.Close(val)
@ -42,7 +42,7 @@ typedef v8::PropertyCallbackInfo<v8::Value> SwigV8PropertyCallbackInfo;
#define SWIGV8_ESCAPE(val) return scope.Escape(val)
#endif
#if (SWIG_V8_VERSION < 0x032440)
#if (SWIG_V8_VERSION < 0x032318)
#define SWIGV8_CURRENT_CONTEXT() v8::Context::GetCurrent()
#define SWIGV8_STRING_NEW(str) v8::String::New(str)
#define SWIGV8_FUNCTEMPLATE_NEW(func) v8::FunctionTemplate::New(func)
@ -112,7 +112,7 @@ private:
#error "implement dll loading"
#endif
V8Shell::V8Shell(){}
V8Shell::V8Shell() {}
V8Shell::~V8Shell() {}
@ -237,8 +237,6 @@ bool V8Shell::DisposeEngine() {
}
SwigV8Context V8Shell::CreateShellContext() {
SWIGV8_HANDLESCOPE_ESC();
// Create a template for the global object.
v8::Handle<v8::ObjectTemplate> global = v8::ObjectTemplate::New();
@ -253,7 +251,7 @@ SwigV8Context V8Shell::CreateShellContext() {
return context;
#else
SwigV8Context context = v8::Context::New(v8::Isolate::GetCurrent(), NULL, global);
SWIGV8_ESCAPE(context);
return context;
#endif
}