Bug 1438278 - Part 2: Rename a template because there is another global template with the same name in jsgc.cpp. r=jonco.

--HG--
extra : rebase_source : 7bc4943739195acbfe1b52a543f32b1ecc99736a
extra : amend_source : 21dbeda4baa38db78756b31472f854994e3236e6
This commit is contained in:
Jason Orendorff 2018-02-16 10:54:58 -06:00
Родитель 2001443c7d
Коммит 7ff58bb5a7
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -3398,7 +3398,7 @@ IsAboutToBeFinalizedInternal(T** thingp)
}
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);
@ -3410,7 +3410,7 @@ static bool
IsAboutToBeFinalizedInternal(T* thingp)
{
bool rv = false;
*thingp = DispatchTyped(IsAboutToBeFinalizedFunctor<T>(), *thingp, &rv);
*thingp = DispatchTyped(IsAboutToBeFinalizedInternalFunctor<T>(), *thingp, &rv);
return rv;
}