Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed warnings on MSVC. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4469 4a71c877-e1ca-e34f-864e-861f7616d084
master
Roman C 2008-04-02 17:39:42 +00:00
parent a2ecc16596
commit 0ee1e1b965
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/framework/macros.h
View File

@ -40,9 +40,9 @@
/** /**
* Returns the index of the lowest value in the array. * Returns the index of the lowest value in the array.
*/ */
static inline int arrayMin(const int *array, const size_t n, int *index) static inline int arrayMin(const int *array, const size_t n, size_t *index)
{ {
int i, minIdx; size_t i, minIdx;
// Find the index of the minimum value // Find the index of the minimum value
for (i = minIdx = 0; i < n; i++) for (i = minIdx = 0; i < n; i++)
@ -63,9 +63,9 @@ static inline int arrayMin(const int *array, const size_t n, int *index)
return array[minIdx]; return array[minIdx];
} }
static inline float arrayMinF(const float *array, const size_t n, int *index) static inline float arrayMinF(const float *array, const size_t n, size_t *index)
{ {
int i, minIdx; size_t i, minIdx;
// Find the index of the minimum value // Find the index of the minimum value
for (i = minIdx = 0; i < n; i++) for (i = minIdx = 0; i < n; i++)
@ -86,9 +86,9 @@ static inline float arrayMinF(const float *array, const size_t n, int *index)
return array[minIdx]; return array[minIdx];
} }
static inline int arrayMax(const int *array, const size_t n, int *index) static inline int arrayMax(const int *array, const size_t n, size_t *index)
{ {
int i, maxIdx; size_t i, maxIdx;
// Find the index of the maximum value // Find the index of the maximum value
for (i = maxIdx = 0; i < n; i++) for (i = maxIdx = 0; i < n; i++)
@ -109,9 +109,9 @@ static inline int arrayMax(const int *array, const size_t n, int *index)
return array[maxIdx]; return array[maxIdx];
} }
static inline float arrayMaxF(const float *array, const size_t n, int *index) static inline float arrayMaxF(const float *array, const size_t n, size_t *index)
{ {
int i, maxIdx; size_t i, maxIdx;
// Find the index of the maximum value // Find the index of the maximum value
for (i = maxIdx = 0; i < n; i++) for (i = maxIdx = 0; i < n; i++)