mod_v8: Minor tweaks to keep up with recent V8 API changes

diff --git a/src/mod/languages/mod_v8/mod_v8.cpp b/src/mod/languages/mod_v8/mod_v8.cpp
index 4e72fbd8a8bddbd7d624116dc346e4ca9e4103b0..7d1cdefaf55057d21432730535db4bdb8794bf3b 100644 (file)
--- a/src/mod/languages/mod_v8/mod_v8.cpp
+++ b/src/mod/languages/mod_v8/mod_v8.cpp
@@ -565,7 +565,7 @@ static int v8_parse_and_execute(switch_core_session_t *session, const char *inpu
                                                TryCatch try_catch;
 
                                                // Compile the source code.
-                                               Handle<Script> v8_script = Script::Compile(source, Handle<Value>::New(isolate, String::NewFromUtf8(isolate, script_file)));
+                                               Handle<Script> v8_script = Script::Compile(source, Local<Value>::New(isolate, String::NewFromUtf8(isolate, script_file)));
 
                                                if (try_catch.HasCaught()) {
                                                        v8_error(isolate, &try_catch);

diff --git a/src/mod/languages/mod_v8/src/fscoredb.cpp b/src/mod/languages/mod_v8/src/fscoredb.cpp
index 39312c0bd334634f0b1422d44307a7405d7e8a9c..2cf15c0a2ab2b76bb733f326b64049acf848d6f3 100644 (file)
--- a/src/mod/languages/mod_v8/src/fscoredb.cpp
+++ b/src/mod/languages/mod_v8/src/fscoredb.cpp
@@ -122,7 +122,7 @@ int FSCoreDB::Callback(void *pArg, int argc, char **argv, char **columnNames)
        }
 
        HandleScope scope(dbo->GetIsolate());
-       Handle<Function> func =  Handle<Function>::New(dbo->GetIsolate(), dbo->_callback);
+       Handle<Function> func =  Local<Function>::New(dbo->GetIsolate(), dbo->_callback);
        Handle<Value> jsargv[1] = { arg };
 
        func->Call(dbo->GetIsolate()->GetCurrentContext()->Global(), 1, jsargv);

diff --git a/src/mod/languages/mod_v8/src/fscurl.cpp b/src/mod/languages/mod_v8/src/fscurl.cpp
index a8e19fb6c8002c359f20c50a9c78766f7c99a165..240f8d15817eac94282a5c628c99bc182bf3a3de 100644 (file)
--- a/src/mod/languages/mod_v8/src/fscurl.cpp
+++ b/src/mod/languages/mod_v8/src/fscurl.cpp
@@ -72,7 +72,7 @@ size_t FSCURL::FileCallback(void *ptr, size_t size, size_t nmemb, void *data)
        Handle<Function> func;
        
        if (!obj->_function.IsEmpty()) {
-               func = Handle<Function>::New(obj->GetIsolate(), obj->_function);
+               func = Local<Function>::New(obj->GetIsolate(), obj->_function);
        }
 
        if (!func.IsEmpty()) {
@@ -83,7 +83,7 @@ size_t FSCURL::FileCallback(void *ptr, size_t size, size_t nmemb, void *data)
                        argv[argc++] = String::NewFromUtf8(obj->GetIsolate(), "");
                }
                if (!obj->_user_data.IsEmpty()) {
-                       argv[argc++] = Handle<Value>::New(obj->GetIsolate(), Persistent<Value>::Cast(obj->_user_data));
+                       argv[argc++] = Local<Value>::New(obj->GetIsolate(), Persistent<Value>::Cast(obj->_user_data));
                }
 
                Handle<Value> res = func->Call(obj->GetIsolate()->GetCurrentContext()->Global(), argc, argv);
@@ -94,7 +94,7 @@ size_t FSCURL::FileCallback(void *ptr, size_t size, size_t nmemb, void *data)
                        obj->_ret.Reset();
                }
 
-               String::Utf8Value str(Handle<Value>::New(obj->GetIsolate(), res));
+               String::Utf8Value str(Local<Value>::New(obj->GetIsolate(), res));
 
                if ((ret = *str)) {
                        if (!strcmp(ret, "true") || !strcmp(ret, "undefined")) {

diff --git a/src/mod/languages/mod_v8/src/fssession.cpp b/src/mod/languages/mod_v8/src/fssession.cpp
index 4e45bea8afc5904e158ffc487b1746c010bf5ceb..9c03c8e7dc9b2b77834e44fe441f65448d0dc786 100644 (file)
--- a/src/mod/languages/mod_v8/src/fssession.cpp
+++ b/src/mod/languages/mod_v8/src/fssession.cpp
@@ -213,11 +213,11 @@ switch_status_t FSSession::CommonCallback(switch_core_session_t *session, void *
        HandleScope handle_scope(isolate);
 
        if (cb_state->jss_a && cb_state->jss_a->_session && cb_state->jss_a->_session == session) {
-               argv[argc++] = Handle<Object>::New(isolate, cb_state->session_obj_a);
+               argv[argc++] = Local<Object>::New(isolate, cb_state->session_obj_a);
        } else if (cb_state->jss_b && cb_state->jss_b->_session && cb_state->jss_b->_session == session) {
-               argv[argc++] = Handle<Object>::New(isolate, cb_state->session_obj_b);
+               argv[argc++] = Local<Object>::New(isolate, cb_state->session_obj_b);
        } else {
-               argv[argc++] = Handle<Object>::New(isolate, cb_state->session_state->GetJavaScriptObject());
+               argv[argc++] = Local<Object>::New(isolate, cb_state->session_state->GetJavaScriptObject());
        }
 
        switch (itype) {
@@ -226,7 +226,7 @@ switch_status_t FSSession::CommonCallback(switch_core_session_t *session, void *
                        Event = FSEvent::New(event, "", cb_state->session_state->GetOwner());
                        if (!Event.IsEmpty()) {
                                argv[argc++] = String::NewFromUtf8(isolate, "event");
-                               argv[argc++] = Handle<Object>::New(isolate, Event);
+                               argv[argc++] = Local<Object>::New(isolate, Event);
                        }
                }
                if (Event.IsEmpty()) {
@@ -241,7 +241,7 @@ switch_status_t FSSession::CommonCallback(switch_core_session_t *session, void *
                                Event = FSDTMF::New(dtmf, "", cb_state->session_state->GetOwner());
                                if (!Event.IsEmpty()) {
                                        argv[argc++] = String::NewFromUtf8(isolate, "dtmf");
-                                       argv[argc++] = Handle<Object>::New(isolate, Event);
+                                       argv[argc++] = Local<Object>::New(isolate, Event);
                                } else {
                                        goto done;
                                }
@@ -251,14 +251,14 @@ switch_status_t FSSession::CommonCallback(switch_core_session_t *session, void *
        }
 
        if (!cb_state->arg.IsEmpty()) {
-               argv[argc++] = Handle<Value>::New(isolate, cb_state->arg);
+               argv[argc++] = Local<Value>::New(isolate, cb_state->arg);
        }
 
        CheckHangupHook(cb_state->session_state, &ret);
 
        if (ret) {
                if (!cb_state->function.IsEmpty()) {
-                       Handle<Function> func = Handle<Function>::New(isolate, cb_state->function);
+                       Handle<Function> func = Local<Function>::New(isolate, cb_state->function);
 
                        if (func->IsFunction()) {
                                Handle<Value> res = func->Call(isolate->GetCurrentContext()->Global(), argc, argv);
@@ -299,7 +299,7 @@ switch_status_t FSSession::StreamInputCallback(switch_core_session_t *session, v
        }
 
        if (!cb_state->ret.IsEmpty()) {
-               Handle<Value> tmp = Handle<Value>::New(obj->GetOwner()->GetIsolate(), cb_state->ret);
+               Handle<Value> tmp = Local<Value>::New(obj->GetOwner()->GetIsolate(), cb_state->ret);
                String::Utf8Value str(tmp);
                const char *ret = js_safe_str(*str);
 
@@ -410,7 +410,7 @@ switch_status_t FSSession::RecordInputCallback(switch_core_session_t *session, v
        }
 
        if (!cb_state->ret.IsEmpty()) {
-               Handle<Value> tmp = Handle<Value>::New(obj->GetOwner()->GetIsolate(), cb_state->ret);
+               Handle<Value> tmp = Local<Value>::New(obj->GetOwner()->GetIsolate(), cb_state->ret);
                String::Utf8Value str(tmp);
                const char *ret = js_safe_str(*str);
 
@@ -451,7 +451,7 @@ switch_status_t FSSession::CollectInputCallback(switch_core_session_t *session,
        }
 
        if (!cb_state->ret.IsEmpty()) {
-               Handle<Value> tmp = Handle<Value>::New(obj->GetOwner()->GetIsolate(), cb_state->ret);
+               Handle<Value> tmp = Local<Value>::New(obj->GetOwner()->GetIsolate(), cb_state->ret);
                String::Utf8Value str(tmp);
                ret = js_safe_str(*str);
 
@@ -703,7 +703,7 @@ bool FSSession::CheckHangupHook(FSSession *obj, bool *ret)
 
        if (obj && !obj->_check_state && !obj->_on_hangup.IsEmpty() && (obj->_hook_state == CS_HANGUP || obj->_hook_state == CS_ROUTING)) {
                obj->_check_state++;
-               argv[argc++] = Handle<Object>::New(obj->GetOwner()->GetIsolate(), obj->GetJavaScriptObject());
+               argv[argc++] = Local<Object>::New(obj->GetOwner()->GetIsolate(), obj->GetJavaScriptObject());
 
                if (obj->_hook_state == CS_HANGUP) {
                        argv[argc++] = String::NewFromUtf8(isolate, "hangup");
@@ -712,7 +712,7 @@ bool FSSession::CheckHangupHook(FSSession *obj, bool *ret)
                }
 
                // Run the hangup hook
-               Handle<Function> func = Handle<Function>::New(isolate, obj->_on_hangup);
+               Handle<Function> func = Local<Function>::New(isolate, obj->_on_hangup);
 
                if (!func.IsEmpty() && func->IsFunction()) {
                        Handle<Value> res = func->Call(isolate->GetCurrentContext()->Global(), argc, argv);

diff --git a/src/mod/languages/mod_v8/src/fsteletone.cpp b/src/mod/languages/mod_v8/src/fsteletone.cpp
index 5a572561072e36a5da90247e7b858ced1caabb4f..9b1f355d2a89300670206525385c01e54f504634 100644 (file)
--- a/src/mod/languages/mod_v8/src/fsteletone.cpp
+++ b/src/mod/languages/mod_v8/src/fsteletone.cpp
@@ -275,10 +275,10 @@ JS_TELETONE_FUNCTION_IMPL(Generate)
                                        aargv[aargc++] = String::NewFromUtf8(info.GetIsolate(), dtmf);
 
                                        if (!_arg.IsEmpty()) {
-                                               aargv[aargc++] = Handle<Value>::New(info.GetIsolate(), _arg);
+                                               aargv[aargc++] = Local<Value>::New(info.GetIsolate(), _arg);
                                        }
 
-                                       Handle<Function> func = Handle<Function>::New(info.GetIsolate(), _function);
+                                       Handle<Function> func = Local<Function>::New(info.GetIsolate(), _function);
                                        Handle<Value> res = func->Call(info.GetIsolate()->GetCurrentContext()->Global(), aargc, aargv);
 
                                        String::Utf8Value tmp(res);

diff --git a/src/mod/languages/mod_v8/src/jsbase.cpp b/src/mod/languages/mod_v8/src/jsbase.cpp
index f8c34086f38756355892043df18c4596a5350d69..42231a44fcc6d514cc692211eb916c7c4a2ceae2 100644 (file)
--- a/src/mod/languages/mod_v8/src/jsbase.cpp
+++ b/src/mod/languages/mod_v8/src/jsbase.cpp
@@ -83,7 +83,7 @@ JSBase::~JSBase(void)
 Handle<Object> JSBase::GetJavaScriptObject()
 {
        /* Returns the javascript object related to this C++ instance */
-       return Handle<Object>::New(GetIsolate(), *persistentHandle);
+       return Local<Object>::New(GetIsolate(), *persistentHandle);
 }
 
 void JSBase::AddInstance(Isolate *isolate, const Handle<Object>& handle, const Handle<External>& object, bool autoDestroy)

diff --git a/src/mod/languages/mod_v8/src/jsmain.cpp b/src/mod/languages/mod_v8/src/jsmain.cpp
index f173e4747fa420967c02b3a948fda19f74a1d204..f06240da093666bf8b2e7d3edf12202e8348a193 100644 (file)
--- a/src/mod/languages/mod_v8/src/jsmain.cpp
+++ b/src/mod/languages/mod_v8/src/jsmain.cpp
@@ -302,7 +302,7 @@ const string JSMain::ExecuteString(const string& scriptData, const string& fileN
                        TryCatch try_catch;
 
                        // Compile the source code.
-                       Handle<Script> script = Script::Compile(source, Handle<Value>::New(isolate, String::NewFromUtf8(isolate, fileName.c_str())));
+                       Handle<Script> script = Script::Compile(source, Local<Value>::New(isolate, String::NewFromUtf8(isolate, fileName.c_str())));
 
                        if (try_catch.HasCaught()) {
                                res = JSMain::GetExceptionInfo(isolate, &try_catch);