aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2014-09-03 11:22:34 +0200
committerDavid 'Digit' Turner <digit@google.com>2014-09-03 11:45:17 +0200
commit4a7d6ec3bde398fcf8a3c3691b803acaa4fa01da (patch)
treedc2ef61dda523600f05aae26e76847682e131690
parent89fcf67c0e039d733c1e63fc6fe65079024bd99c (diff)
downloadqemu-4a7d6ec3bde398fcf8a3c3691b803acaa4fa01da.tar.gz
android/base/HashUtils.h: Remove compiler error.
When building with gcc 4.2.1, the reinterpret_cast<size_t>() didn't compile. Replace it with a static_cast<> instead to solve the issue, which doesn't happen with more recent toolchains. Note: gcc 4.2.1 is still the default compiler on older OS X releases when XCode 5 is not installed. BUG=17357875 Change-Id: If308a81c89b50cd8831a75132f9c53e9c622760e
-rw-r--r--android/base/containers/HashUtils.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/base/containers/HashUtils.h b/android/base/containers/HashUtils.h
index b02413b05d..6a3f65e490 100644
--- a/android/base/containers/HashUtils.h
+++ b/android/base/containers/HashUtils.h
@@ -41,7 +41,7 @@ size_t hashShiftAdjust(size_t size, size_t oldShift);
// Hash a pointer value into something that can be used to implement
// hash tables.
inline size_t pointerHash(const void* ptr) {
- return reinterpret_cast<size_t>(
+ return static_cast<size_t>(
reinterpret_cast<uintptr_t>(ptr));
}