[gjs/wip/ptomato/mozjs45: 21/30] js: Rename JS_InternString to JS_AtomizeAndPinString
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/wip/ptomato/mozjs45: 21/30] js: Rename JS_InternString to JS_AtomizeAndPinString
- Date: Wed, 3 May 2017 06:39:59 +0000 (UTC)
commit 4a2f80f606f7ed37cdb5b124c7db92fc1b7abaf0
Author: Philip Chimento <philip chimento gmail com>
Date: Sun Mar 19 05:15:48 2017 +0000
js: Rename JS_InternString to JS_AtomizeAndPinString
This was simply renamed in SpiderMonkey 45.
gi/repo.cpp | 2 +-
gjs/jsapi-util-string.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gi/repo.cpp b/gi/repo.cpp
index 68f1c41..3727e23 100644
--- a/gi/repo.cpp
+++ b/gi/repo.cpp
@@ -601,7 +601,7 @@ lookup_override_function(JSContext *cx,
/* If the exception was an ImportError (i.e., module not found) then
* we simply didn't have an override, don't throw an exception */
- if (error_has_name(cx, exc, JS_InternString(cx, "ImportError"))) {
+ if (error_has_name(cx, exc, JS_AtomizeAndPinString(cx, "ImportError"))) {
saved_exc.restore();
return true;
}
diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp
index a0be7b8..b137097 100644
--- a/gjs/jsapi-util-string.cpp
+++ b/gjs/jsapi-util-string.cpp
@@ -398,7 +398,7 @@ gjs_intern_string_to_id(JSContext *cx,
const char *string)
{
JSAutoRequest ar(cx);
- JS::RootedString str(cx, JS_InternString(cx, string));
+ JS::RootedString str(cx, JS_AtomizeAndPinString(cx, string));
JS::RootedId id(cx, INTERNED_STRING_TO_JSID(cx, str));
return id;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]