mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-24 03:19:06 +00:00
Fix merge conflict between bug 241518 and 313309
This commit is contained in:
parent
6e714a1f19
commit
e7d03cba44
@ -141,7 +141,7 @@ public:
|
||||
nsMarkedJSFunctionHolder_base::Set(aPotentialFunction, aParticipant);
|
||||
}
|
||||
already_AddRefed<T> Get() {
|
||||
return already_AddRefed<T>(NS_STATIC_CAST(T*, nsMarkedJSFunctionHolder_base::Get(NS_GET_IID(T)).get()));
|
||||
return already_AddRefed<T>(NS_STATIC_CAST(T*, nsMarkedJSFunctionHolder_base::Get(NS_GET_TEMPLATE_IID(T)).get()));
|
||||
}
|
||||
};
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user