Bug 1438278 - Part 2: Rename a template because there is another global template with the same name in jsgc.cpp. r=jonco.
authorJason Orendorff <jorendorff@mozilla.com>
Fri, 16 Feb 2018 10:54:58 -0600
changeset 404195 249a7398961afcefa7a6c1f2b9172d8c85e9104a
parent 404194 745176a7ab4a5197f3e2b77c749b4559a7a5b4c4
child 404196 08702628464616ad69c49390f121e9342e9d625f
push id99965
push userjorendorff@mozilla.com
push dateFri, 16 Feb 2018 21:07:25 +0000
treeherdermozilla-inbound@b3ee97dce95a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjonco
bugs1438278
milestone60.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1438278 - Part 2: Rename a template because there is another global template with the same name in jsgc.cpp. r=jonco.
js/src/gc/Marking.cpp
--- a/js/src/gc/Marking.cpp
+++ b/js/src/gc/Marking.cpp
@@ -3393,29 +3393,29 @@ IsAboutToBeFinalizedInternal(T** thingp)
         *thingp = Forwarded(thing);
         return false;
     }
 
     return false;
 }
 
 template <typename S>
-struct IsAboutToBeFinalizedFunctor : public IdentityDefaultAdaptor<S> {
+struct IsAboutToBeFinalizedInternalFunctor : public IdentityDefaultAdaptor<S> {
     template <typename T> S operator()(T* t, bool* rv) {
         *rv = IsAboutToBeFinalizedInternal(&t);
         return js::gc::RewrapTaggedPointer<S, T>::wrap(t);
     }
 };
 
 template <typename T>
 static bool
 IsAboutToBeFinalizedInternal(T* thingp)
 {
     bool rv = false;
-    *thingp = DispatchTyped(IsAboutToBeFinalizedFunctor<T>(), *thingp, &rv);
+    *thingp = DispatchTyped(IsAboutToBeFinalizedInternalFunctor<T>(), *thingp, &rv);
     return rv;
 }
 
 namespace js {
 namespace gc {
 
 template <typename T>
 bool