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

Backed out changeset 7f301b0d3385 hg push

Browse Source
This commit is contained in:
Dão Gottwald 2010-03-22 17:48:45 +01:00
parent 02861ae602
commit 55d6554fde
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xpcom/glue/nsTArray.h
View File

@ -148,18 +148,11 @@ class NS_COM_GLUE nsTArray_base {
return mHdr->mIsAutoArray;
}
// Dummy struct to get the compiler to simulate the alignment of
// nsAutoTArray's and nsAutoTPtrArray's mAutoBuf.
struct AutoArray {
Header *mHdr;
PRUint64 aligned;
};
// Returns a Header for the built-in buffer of this nsAutoTArray.
Header* GetAutoArrayBuffer() {
NS_ASSERTION(IsAutoArray(), "Should be an auto array to call this");
return reinterpret_cast<Header*>(&(reinterpret_cast<AutoArray*>(&mHdr))->aligned);
return reinterpret_cast<Header*>(&mHdr + 1);
}
// Returns true if this is an nsAutoTArray and it currently uses the
@ -936,10 +929,7 @@ class nsAutoTArray : public nsTArray<E> {
}
protected:
union {
char mAutoBuf[sizeof(Header) + N * sizeof(elem_type)];
PRUint64 dummy;
};
char mAutoBuf[sizeof(Header) + N * sizeof(elem_type)];
};
// specialization for N = 0. this makes the inheritance model easier for

5
xpcom/glue/nsTPtrArray.h
View File

@ -113,10 +113,7 @@ class nsAutoTPtrArray : public nsTPtrArray<E> {
}
protected:
union {
char mAutoBuf[sizeof(Header) + N * sizeof(elem_type)];
PRUint64 dummy;
};
char mAutoBuf[sizeof(Header) + N * sizeof(elem_type)];
};
#endif // nsTPtrArray_h__