Bug 1309466 - Enable Array and EnumeratedArray to be brace-initialized with initial contents.
MozReview-Commit-ID: 9sD9Rg4qsy1
--- a/mfbt/Array.h
+++ b/mfbt/Array.h
@@ -6,28 +6,39 @@
/* A compile-time constant-length array with bounds-checking assertions. */
#ifndef mozilla_Array_h
#define mozilla_Array_h
#include "mozilla/Assertions.h"
#include "mozilla/Attributes.h"
+#include "mozilla/Move.h"
#include "mozilla/ReverseIterator.h"
#include <stddef.h>
namespace mozilla {
template<typename T, size_t Length>
class Array
{
T mArr[Length];
public:
+ Array() {}
+
+ template <typename... Args>
+ MOZ_IMPLICIT Array(Args&&... aArgs)
+ : mArr{mozilla::Forward<Args>(aArgs)...}
+ {
+ static_assert(sizeof...(aArgs) == Length,
+ "The number of arguments should be equal to the template parameter Length");
+ }
+
T& operator[](size_t aIndex)
{
MOZ_ASSERT(aIndex < Length);
return mArr[aIndex];
}
const T& operator[](size_t aIndex) const
{
--- a/mfbt/EnumeratedArray.h
+++ b/mfbt/EnumeratedArray.h
@@ -49,16 +49,21 @@ public:
private:
typedef Array<ValueType, kSize> ArrayType;
ArrayType mArray;
public:
EnumeratedArray() {}
+ template <typename... Args>
+ MOZ_IMPLICIT EnumeratedArray(Args&&... aArgs)
+ : mArray{mozilla::Forward<Args>(aArgs)...}
+ {}
+
explicit EnumeratedArray(const EnumeratedArray& aOther)
{
for (size_t i = 0; i < kSize; i++) {
mArray[i] = aOther.mArray[i];
}
}
EnumeratedArray(EnumeratedArray&& aOther)