Fix merge conflict between bug 241518 and 313309

This commit is contained in:
bsmedberg%covad.net 2005-12-12 20:27:13 +00:00
parent 6e714a1f19
commit e7d03cba44

View File

@ -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()));
}
};