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 1235261 - Part 7: Remove AutoInfallibleTArray. r=froydnj

Browse Source
This commit is contained in:
Birunthan Mohanathas 2016-02-02 17:36:31 +02:00
parent 6b0d824626
commit f8fbde659a
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xpcom/glue/nsTArray.h
View File

@ -57,9 +57,6 @@ struct TileClient;
// nsTArray and AutoTArray are infallible by default. To opt-in to fallible // nsTArray and AutoTArray are infallible by default. To opt-in to fallible
// behaviour, use the `mozilla::fallible` parameter and check the return value. // behaviour, use the `mozilla::fallible` parameter and check the return value.
// //
// InfallibleTArray and AutoInfallibleTArray are aliases for nsTArray and
// AutoTArray.
//
// If you just want to declare the nsTArray types (e.g., if you're in a header // If you just want to declare the nsTArray types (e.g., if you're in a header
// file and don't need the full nsTArray definitions) consider including // file and don't need the full nsTArray definitions) consider including
// nsTArrayForwardDeclare.h instead of nsTArray.h. // nsTArrayForwardDeclare.h instead of nsTArray.h.

1
xpcom/glue/nsTArrayForwardDeclare.h
View File

@ -31,6 +31,5 @@ template<class E, size_t N>
class AutoTArray; class AutoTArray;
#define InfallibleTArray nsTArray #define InfallibleTArray nsTArray
#define AutoInfallibleTArray AutoTArray
#endif #endif

10
xpcom/tests/TestTArray.cpp
View File

@ -1040,8 +1040,6 @@ static bool test_conversion_operator() {
InfallibleTArray<int> i; InfallibleTArray<int> i;
const InfallibleTArray<int> iconst; const InfallibleTArray<int> iconst;
AutoInfallibleTArray<int, 8> iauto;
const AutoInfallibleTArray<int, 8> iautoconst;
nsTArray<int> t; nsTArray<int> t;
const nsTArray<int> tconst; const nsTArray<int> tconst;
@ -1058,10 +1056,6 @@ static bool test_conversion_operator() {
if ((void*)&z5 != (void*)&i) return false; \ if ((void*)&z5 != (void*)&i) return false; \
const type<int>& z6 = iconst; \ const type<int>& z6 = iconst; \
if ((void*)&z6 != (void*)&iconst) return false; \ if ((void*)&z6 != (void*)&iconst) return false; \
const type<int>& z7 = iauto; \
if ((void*)&z7 != (void*)&iauto) return false; \
const type<int>& z8 = iautoconst; \
if ((void*)&z8 != (void*)&iautoconst) return false; \
const type<int>& z9 = t; \ const type<int>& z9 = t; \
if ((void*)&z9 != (void*)&t) return false; \ if ((void*)&z9 != (void*)&t) return false; \
const type<int>& z10 = tconst; \ const type<int>& z10 = tconst; \
@ -1093,7 +1087,6 @@ static bool test_SetLengthAndRetainStorage_no_ctor() {
FallibleTArray<int> f; FallibleTArray<int> f;
InfallibleTArray<int> i; InfallibleTArray<int> i;
AutoInfallibleTArray<int, N> iauto;
nsTArray<int> t; nsTArray<int> t;
AutoTArray<int, N> tauto; AutoTArray<int, N> tauto;
@ -1104,7 +1097,6 @@ static bool test_SetLengthAndRetainStorage_no_ctor() {
do { \ do { \
pre f post; \ pre f post; \
pre i post; \ pre i post; \
pre iauto post; \
pre t post; \ pre t post; \
pre tauto post; \ pre tauto post; \
} while (0) } while (0)
@ -1118,7 +1110,6 @@ static bool test_SetLengthAndRetainStorage_no_ctor() {
void* initial_Hdrs[] = { void* initial_Hdrs[] = {
static_cast<BufAccessor<FallibleTArray<int> >&>(f).GetHdr(), static_cast<BufAccessor<FallibleTArray<int> >&>(f).GetHdr(),
static_cast<BufAccessor<InfallibleTArray<int> >&>(i).GetHdr(), static_cast<BufAccessor<InfallibleTArray<int> >&>(i).GetHdr(),
static_cast<BufAccessor<AutoInfallibleTArray<int, N> >&>(iauto).GetHdr(),
static_cast<BufAccessor<nsTArray<int> >&>(t).GetHdr(), static_cast<BufAccessor<nsTArray<int> >&>(t).GetHdr(),
static_cast<BufAccessor<AutoTArray<int, N> >&>(tauto).GetHdr(), static_cast<BufAccessor<AutoTArray<int, N> >&>(tauto).GetHdr(),
nullptr nullptr
@ -1140,7 +1131,6 @@ static bool test_SetLengthAndRetainStorage_no_ctor() {
void* current_Hdrs[] = { void* current_Hdrs[] = {
static_cast<BufAccessor<FallibleTArray<int> >&>(f).GetHdr(), static_cast<BufAccessor<FallibleTArray<int> >&>(f).GetHdr(),
static_cast<BufAccessor<InfallibleTArray<int> >&>(i).GetHdr(), static_cast<BufAccessor<InfallibleTArray<int> >&>(i).GetHdr(),
static_cast<BufAccessor<AutoInfallibleTArray<int, N> >&>(iauto).GetHdr(),
static_cast<BufAccessor<nsTArray<int> >&>(t).GetHdr(), static_cast<BufAccessor<nsTArray<int> >&>(t).GetHdr(),
static_cast<BufAccessor<AutoTArray<int, N> >&>(tauto).GetHdr(), static_cast<BufAccessor<AutoTArray<int, N> >&>(tauto).GetHdr(),
nullptr nullptr