- fix compile errors

This commit is contained in:
Magnus Norddahl 2018-11-29 19:32:08 +01:00
parent 37e33c6609
commit 5d052fc565
2 changed files with 4 additions and 4 deletions

View file

@ -72,12 +72,12 @@ template<class T> void ArrayMove(T *self, T* other)
template<class T, class U> int ArrayFind(T *self, U val) template<class T, class U> int ArrayFind(T *self, U val)
{ {
return self->Find(static_cast<T::value_type>(val)); return self->Find(static_cast<typename T::value_type>(val));
} }
template<class T, class U> int ArrayPush(T *self, U val) template<class T, class U> int ArrayPush(T *self, U val)
{ {
return self->Push(static_cast<T::value_type>(val)); return self->Push(static_cast<typename T::value_type>(val));
} }
template<class T> bool ArrayPop(T *self) template<class T> bool ArrayPop(T *self)
@ -93,7 +93,7 @@ template<class T> void ArrayDelete(T *self, int index, int count)
template<class T, class U, int fill = 1> void ArrayInsert(T *self, int index, U val) template<class T, class U, int fill = 1> void ArrayInsert(T *self, int index, U val)
{ {
//int oldSize = self->Size(); //int oldSize = self->Size();
self->Insert(index, static_cast<T::value_type>(val)); self->Insert(index, static_cast<typename T::value_type>(val));
// Is this even necessary? All Insert does is inserting one defined element into the array and moving the rest. // Is this even necessary? All Insert does is inserting one defined element into the array and moving the rest.
// It never creates empty tailing entries. fillcount in the macro will always be 0 // It never creates empty tailing entries. fillcount in the macro will always be 0
//if (fill) { DYNARRAY_FILL_ITEMS_SKIP(1); } //if (fill) { DYNARRAY_FILL_ITEMS_SKIP(1); }

View file

@ -108,7 +108,7 @@ public:
typedef TIterator<T> iterator; typedef TIterator<T> iterator;
typedef TIterator<const T> const_iterator; typedef TIterator<const T> const_iterator;
typedef typename T value_type; typedef T value_type;
iterator begin() iterator begin()
{ {