diff options
| author | Eugene Sandulenko | 2016-05-23 22:47:03 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-05-23 22:47:03 +0200 |
| commit | cdbf10ca813fc01979ce82fc7740a3e9f3c21b2b (patch) | |
| tree | 806bcf1325793d19bf85efffe87611a1a6c6f657 /common/array.h | |
| parent | c383ed4104a367f21bc2901dd17ef6349676351e (diff) | |
| download | scummvm-rg350-cdbf10ca813fc01979ce82fc7740a3e9f3c21b2b.tar.gz scummvm-rg350-cdbf10ca813fc01979ce82fc7740a3e9f3c21b2b.tar.bz2 scummvm-rg350-cdbf10ca813fc01979ce82fc7740a3e9f3c21b2b.zip | |
COMMON: Fix another warning.
We're shadowing the class variables with local ones.
Diffstat (limited to 'common/array.h')
| -rw-r--r-- | common/array.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/array.h b/common/array.h index e486a81972..e9b97aa38a 100644 --- a/common/array.h +++ b/common/array.h @@ -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: |