mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1182808 - Part 3: Rename AlignedTArray_Impl to AlignedTArray and remove existing AlignedTArray. r=padenot
This commit is contained in:
parent
7d03785aab
commit
28da60db1c
@ -14,18 +14,18 @@
|
||||
* E: element type, must be a POD type.
|
||||
* N: N bytes alignment for the first element, defaults to 32
|
||||
*/
|
||||
template <typename E, int N, typename Alloc>
|
||||
class AlignedTArray_Impl : public nsTArray_Impl<E, Alloc>
|
||||
template <typename E, int N = 32>
|
||||
class AlignedTArray : public nsTArray_Impl<E, nsTArrayInfallibleAllocator>
|
||||
{
|
||||
static_assert((N & (N-1)) == 0, "N must be power of 2");
|
||||
typedef nsTArray_Impl<E, Alloc> base_type;
|
||||
typedef nsTArray_Impl<E, nsTArrayInfallibleAllocator> base_type;
|
||||
public:
|
||||
typedef E elem_type;
|
||||
typedef typename base_type::size_type size_type;
|
||||
typedef typename base_type::index_type index_type;
|
||||
|
||||
AlignedTArray_Impl() {}
|
||||
explicit AlignedTArray_Impl(size_type capacity) : base_type(capacity+sExtra) {}
|
||||
AlignedTArray() {}
|
||||
explicit AlignedTArray(size_type capacity) : base_type(capacity + sExtra) {}
|
||||
elem_type* Elements() { return getAligned(base_type::Elements()); }
|
||||
const elem_type* Elements() const { return getAligned(base_type::Elements()); }
|
||||
elem_type& operator[](index_type i) { return Elements()[i];}
|
||||
@ -47,8 +47,8 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
AlignedTArray_Impl(const AlignedTArray_Impl& other) = delete;
|
||||
void operator=(const AlignedTArray_Impl& other) = delete;
|
||||
AlignedTArray(const AlignedTArray& other) = delete;
|
||||
void operator=(const AlignedTArray& other) = delete;
|
||||
|
||||
static const size_type sPadding = N <= MOZ_ALIGNOF(E) ? 0 : N - MOZ_ALIGNOF(E);
|
||||
static const size_type sExtra = (sPadding + sizeof(E) - 1) / sizeof(E);
|
||||
@ -60,19 +60,4 @@ private:
|
||||
}
|
||||
};
|
||||
|
||||
template <typename E, int N=32>
|
||||
class AlignedTArray : public AlignedTArray_Impl<E, N, nsTArrayInfallibleAllocator>
|
||||
{
|
||||
public:
|
||||
typedef AlignedTArray_Impl<E, N, nsTArrayInfallibleAllocator> base_type;
|
||||
typedef AlignedTArray<E, N> self_type;
|
||||
typedef typename base_type::size_type size_type;
|
||||
|
||||
AlignedTArray() {}
|
||||
explicit AlignedTArray(size_type capacity) : base_type(capacity) {}
|
||||
private:
|
||||
AlignedTArray(const AlignedTArray& other) = delete;
|
||||
void operator=(const AlignedTArray& other) = delete;
|
||||
};
|
||||
|
||||
#endif // AlignedTArray_h__
|
||||
|
Loading…
Reference in New Issue
Block a user