libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-03 08:40:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: Fix another warning.

Browse Source 
We're shadowing the class variables with local ones.
This commit is contained in:
Eugene Sandulenko 2016-05-23 22:47:03 +02:00
parent c383ed4104
commit cdbf10ca81
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/array.h
View File

@ -415,7 +415,7 @@ private:
// Based on code Copyright (C) 2008-2009 Ksplice, Inc.
// Author: Tim Abbott <tabbott@ksplice.com>
// Licensed under GPLv2+
void *bsearchMin(void *key, void *base, uint num, uint size,
void *bsearchMin(void *key, void *base, uint num, uint size_,
int (*cmp)(const void *key, const void *elt)) {
uint start_ = 0, end_ = num;
int result;
@ -423,16 +423,16 @@ private:
while (start_ < end_) {
uint mid = start_ + (end_ - start_) / 2;
result = cmp(key, (byte *)base + mid * size);
result = cmp(key, (byte *)base + mid * size_);
if (result < 0)
end_ = mid;
else if (result > 0)
start_ = mid + 1;
else
return (void *)((byte *)base + mid * size);
return (void *)((byte *)base + mid * size_);
}
return (void *)((byte *)base + start_ * size);
return (void *)((byte *)base + start_ * size_);
}
private: