wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1039521 - nsTArray: Add an AppendElement take taking a r-value reference. r=froydnj

Browse Source 
This lets us store UniquePtr's in nsTArrays

--HG--
extra : rebase_source : d7ea9ef710bd2451d0e2e9ba1aaefa9559315875
This commit is contained in:
Jeff Muizelaar 2014-07-18 09:43:42 -04:00
parent ea3a63713b
commit 85318d9ef1
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xpcom/glue/nsTArray.h
View File

@ -11,6 +11,7 @@
#include "mozilla/Alignment.h"
#include "mozilla/Assertions.h"
#include "mozilla/MemoryReporting.h"
#include "mozilla/Move.h"
#include "mozilla/TypeTraits.h"
#include <string.h>
@ -468,14 +469,14 @@ public:
}
// Invoke the copy-constructor in place.
template<class A>
static inline void Construct(E* aE, const A& aArg)
static inline void Construct(E* aE, A &&aArg)
{
typedef typename mozilla::RemoveCV<E>::Type E_NoCV;
typedef typename mozilla::RemoveCV<A>::Type A_NoCV;
static_assert(!mozilla::IsSame<E_NoCV*, A_NoCV>::value,
"For safety, we disallow constructing nsTArray<E> elements "
"from E* pointers. See bug 960591.");
new (static_cast<void*>(aE)) E(aArg);
new (static_cast<void*>(aE)) E(mozilla::Forward<A>(aArg));
}
// Invoke the destructor in place.
static inline void Destruct(E* aE) { aE->~E(); }
@ -1254,6 +1255,20 @@ public:
return AppendElements(&aItem, 1);
}
// A variation of AppendElement that takes an r-value reference
elem_type* AppendElement(elem_type&& aItem)
{
if (!Alloc::Successful(this->EnsureCapacity(Length() + 1,
sizeof(elem_type))))
return nullptr;
index_type len = Length();
elem_type* iter = Elements() + len;
nsTArrayElementTraits<elem_type>::Construct(iter, mozilla::Forward<elem_type>(aItem));
this->IncrementLength(1);
return iter;
}
// Append new elements without copy-constructing. This is useful to avoid
// temporaries.
// @return A pointer to the newly appended elements, or null on OOM.