Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 994465 - Make Optional::Construct() return T&; r=bz

Browse Source
This commit is contained in:
Jan-Ivar Bruaroey 2014-04-10 02:03:29 -04:00
parent 23741a3a55
commit ae220d2b2f
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dom/bindings/BindingDeclarations.h
View File

@ -111,21 +111,25 @@ public:
return !mImpl.empty();
}
void Construct()
// Return InternalType here so we can work with it usefully.
InternalType& Construct()
{
mImpl.construct();
return mImpl.ref();
}
template <class T1>
void Construct(const T1 &t1)
InternalType& Construct(const T1 &t1)
{
mImpl.construct(t1);
return mImpl.ref();
}
template <class T1, class T2>
void Construct(const T1 &t1, const T2 &t2)
InternalType& Construct(const T1 &t1, const T2 &t2)
{
mImpl.construct(t1, t2);
return mImpl.ref();
}
void Reset()
@ -228,18 +232,18 @@ public:
{}
// Don't allow us to have an uninitialized JSObject*
void Construct()
JSObject*& Construct()
{
// The Android compiler sucks and thinks we're trying to construct
// a JSObject* from an int if we don't cast here. :(
Optional_base<JSObject*, JSObject*>::Construct(
return Optional_base<JSObject*, JSObject*>::Construct(
static_cast<JSObject*>(nullptr));
}
template <class T1>
void Construct(const T1& t1)
JSObject*& Construct(const T1& t1)
{
Optional_base<JSObject*, JSObject*>::Construct(t1);
return Optional_base<JSObject*, JSObject*>::Construct(t1);
}
};