[gjs/wip/ptomato/mozjs38: 14/26] js: Rename JS_CallHeapFooTracer()
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/wip/ptomato/mozjs38: 14/26] js: Rename JS_CallHeapFooTracer()
- Date: Thu, 26 Jan 2017 02:19:37 +0000 (UTC)
commit 63526f791b99f3c9dd0bd5e4d6ec6f35494dc24a
Author: Philip Chimento <philip chimento gmail com>
Date: Wed Jan 11 22:59:25 2017 -0800
js: Rename JS_CallHeapFooTracer()
The various flavours of JS_CallHeapFooTracer() are now called
JS_CallFooTracer() in SpiderMonkey 38.
gi/boxed.cpp | 8 ++++----
gi/fundamental.cpp | 4 ++--
gi/keep-alive.cpp | 2 +-
gjs/context.cpp | 2 +-
gjs/coverage.cpp | 2 +-
gjs/jsapi-util-root.h | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/gi/boxed.cpp b/gi/boxed.cpp
index bf6e478..51150e1 100644
--- a/gi/boxed.cpp
+++ b/gi/boxed.cpp
@@ -898,10 +898,10 @@ boxed_trace(JSTracer *tracer,
if (priv == NULL)
return;
- JS_CallHeapIdTracer(tracer, &priv->zero_args_constructor_name,
- "Boxed::zero_args_constructor_name");
- JS_CallHeapIdTracer(tracer, &priv->default_constructor_name,
- "Boxed::default_constructor_name");
+ JS_CallIdTracer(tracer, &priv->zero_args_constructor_name,
+ "Boxed::zero_args_constructor_name");
+ JS_CallIdTracer(tracer, &priv->default_constructor_name,
+ "Boxed::default_constructor_name");
}
/* The bizarre thing about this vtable is that it applies to both
diff --git a/gi/fundamental.cpp b/gi/fundamental.cpp
index 9970328..23099df 100644
--- a/gi/fundamental.cpp
+++ b/gi/fundamental.cpp
@@ -517,8 +517,8 @@ fundamental_trace(JSTracer *tracer,
if (priv == NULL)
return;
- JS_CallHeapIdTracer(tracer, &priv->constructor_name,
- "Fundamental::constructor_name");
+ JS_CallIdTracer(tracer, &priv->constructor_name,
+ "Fundamental::constructor_name");
}
/* The bizarre thing about this vtable is that it applies to both
diff --git a/gi/keep-alive.cpp b/gi/keep-alive.cpp
index d13397d..258cf58 100644
--- a/gi/keep-alive.cpp
+++ b/gi/keep-alive.cpp
@@ -141,7 +141,7 @@ keep_alive_trace(JSTracer *tracer,
while (g_hash_table_iter_next(&iter, &key, NULL)) {
Child *child = static_cast<Child *>(key);
JSObject *old_key = child->child.get();
- JS_CallHeapObjectTracer(tracer, &child->child, "keep-alive::val");
+ JS_CallObjectTracer(tracer, &child->child, "keep-alive::val");
/* Remove and reinsert if the pointer's location was updated,
* because that means the hash value is different */
diff --git a/gjs/context.cpp b/gjs/context.cpp
index e08981a..03a0812 100644
--- a/gjs/context.cpp
+++ b/gjs/context.cpp
@@ -370,7 +370,7 @@ static void
gjs_context_tracer(JSTracer *trc, void *data)
{
GjsContext *gjs_context = reinterpret_cast<GjsContext *>(data);
- JS_CallHeapObjectTracer(trc, &gjs_context->global, "GJS global object");
+ JS_CallObjectTracer(trc, &gjs_context->global, "GJS global object");
}
static void
diff --git a/gjs/coverage.cpp b/gjs/coverage.cpp
index f75a065..cee87ba 100644
--- a/gjs/coverage.cpp
+++ b/gjs/coverage.cpp
@@ -1498,7 +1498,7 @@ coverage_statistics_tracer(JSTracer *trc, void *data)
GjsCoverage *coverage = (GjsCoverage *) data;
GjsCoveragePrivate *priv = (GjsCoveragePrivate *) gjs_coverage_get_instance_private(coverage);
- JS_CallHeapObjectTracer(trc, &priv->coverage_statistics, "coverage_statistics");
+ JS_CallObjectTracer(trc, &priv->coverage_statistics, "coverage_statistics");
}
/* This function is mainly used in the tests in order to fiddle with
diff --git a/gjs/jsapi-util-root.h b/gjs/jsapi-util-root.h
index 1ee1297..de6feb4 100644
--- a/gjs/jsapi-util-root.h
+++ b/gjs/jsapi-util-root.h
@@ -45,7 +45,7 @@ struct GjsTraceHeap<JSObject *> {
JS::Heap<JSObject *> *thing,
const char *name)
{
- JS_CallHeapObjectTracer(tracer, thing, name);
+ JS_CallObjectTracer(tracer, thing, name);
}
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]