[Scummvm-cvs-logs] scummvm master -> cdbf10ca813fc01979ce82fc7740a3e9f3c21b2b

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cdbf10ca81 COMMON: Fix another warning.


Commit: cdbf10ca813fc01979ce82fc7740a3e9f3c21b2b
    https://github.com/scummvm/scummvm/commit/cdbf10ca813fc01979ce82fc7740a3e9f3c21b2b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-23T22:47:03+02:00

Commit Message:
COMMON: Fix another warning.

We're shadowing the class variables with local ones.

Changed paths:
    common/array.h



diff --git a/common/array.h b/common/array.h
index e486a81..e9b97aa 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 at 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: