diff --git a/src/lol/base/array.h b/src/lol/base/array.h index f7b79aef..cdfd66b7 100644 --- a/src/lol/base/array.h +++ b/src/lol/base/array.h @@ -556,12 +556,14 @@ class Array : public ArrayBase, Array>::ArrayBase; #else public: + typedef ArrayElement Element; + inline Array() - : ArrayBase, + : ArrayBase>::ArrayBase() {} inline Array(std::initializer_list const &list) - : ArrayBase, + : ArrayBase>::ArrayBase(list) {} #endif @@ -609,12 +611,14 @@ class Array Array>::ArrayBase; #else public: + typedef ArrayElement Element; + inline Array() - : ArrayBase, + : ArrayBase>::ArrayBase() {} inline Array(std::initializer_list const &list) - : ArrayBase, + : ArrayBase>::ArrayBase(list) {} #endif @@ -660,12 +664,14 @@ class Array Array>::ArrayBase; #else public: + typedef ArrayElement Element; + inline Array() - : ArrayBase, + : ArrayBase>::ArrayBase() {} inline Array(std::initializer_list const &list) - : ArrayBase, + : ArrayBase>::ArrayBase(list) {} #endif @@ -708,12 +714,14 @@ class Array Array>::ArrayBase; #else public: + typedef ArrayElement Element; + inline Array() - : ArrayBase, + : ArrayBase>::ArrayBase() {} inline Array(std::initializer_list const &list) - : ArrayBase, + : ArrayBase>::ArrayBase(list) {} #endif @@ -754,12 +762,14 @@ class Array Array>::ArrayBase; #else public: + typedef ArrayElement Element; + inline Array() - : ArrayBase, + : ArrayBase>::ArrayBase() {} inline Array(std::initializer_list const &list) - : ArrayBase, + : ArrayBase>::ArrayBase(list) {} #endif @@ -796,12 +806,14 @@ class Array Array>::ArrayBase; #else public: + typedef ArrayElement Element; + inline Array() - : ArrayBase, + : ArrayBase>::ArrayBase() {} inline Array(std::initializer_list const &list) - : ArrayBase, + : ArrayBase>::ArrayBase(list) {} #endif @@ -836,12 +848,14 @@ class Array Array>::ArrayBase; #else public: + typedef ArrayElement Element; + inline Array() - : ArrayBase, + : ArrayBase>::ArrayBase() {} inline Array(std::initializer_list const &list) - : ArrayBase, + : ArrayBase>::ArrayBase(list) {} #endif @@ -874,6 +888,8 @@ class Array Array>::ArrayBase; #else public: + typedef T Element; + inline Array() : ArrayBase>::ArrayBase() {}