- fixed compilation warnings.

This commit is contained in:
Christoph Oelckers 2018-11-29 20:11:28 +01:00
parent 717912c88c
commit b8394b2f16
3 changed files with 6 additions and 5 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(val); return self->Find(static_cast<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(val); return self->Push(static_cast<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, val); self->Insert(index, static_cast<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,6 +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;
iterator begin() iterator begin()
{ {

View file

@ -1450,7 +1450,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(_TexMan, GetSize, GetTextureSize)
static void GetScaledSize(int texid, DVector2 *pvec) static void GetScaledSize(int texid, DVector2 *pvec)
{ {
auto tex = TexMan.ByIndex(texid); auto tex = TexMan.ByIndex(texid);
int x, y; double x, y;
if (tex != nullptr) if (tex != nullptr)
{ {
x = tex->GetScaledWidthDouble(); x = tex->GetScaledWidthDouble();
@ -1481,7 +1481,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(_TexMan, GetScaledSize, GetScaledSize)
static void GetScaledOffset(int texid, DVector2 *pvec) static void GetScaledOffset(int texid, DVector2 *pvec)
{ {
auto tex = TexMan.ByIndex(texid); auto tex = TexMan.ByIndex(texid);
int x, y; double x, y;
if (tex != nullptr) if (tex != nullptr)
{ {
x = tex->GetScaledLeftOffsetDouble(0); x = tex->GetScaledLeftOffsetDouble(0);