aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2012-02-23 18:44:45 +0000
committermark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2012-02-23 18:44:45 +0000
commit7caf87236af2a15579e71720598a538117cd6619 (patch)
treee460cf80583491e46ae6bfe290eac55e0dd2aedb /src
parentAdd support for @ operator to PostfixEvaluator (diff)
downloadbreakpad-7caf87236af2a15579e71720598a538117cd6619.tar.xz
Fix an invalid cast in PostfixEvaluator<ValueType>::EvaluateInternal().
This patch fixes a compilation error with gcc / clang on Linux / Mac OS. BUG=none TEST=Tested the following: 1. Build on 32-bit and 64-bit Linux with gcc 4.4.3 and gcc 4.6. 2. Build on Mac OS X 10.6.8 with gcc 4.2 and clang 3.0 (with latest gmock). 3. All unit tests pass. Patch by Ben Chan <benchan@chromium.org> git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@924 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src')
-rw-r--r--src/processor/postfix_evaluator-inl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/processor/postfix_evaluator-inl.h b/src/processor/postfix_evaluator-inl.h
index 22faf7b2..332ba1af 100644
--- a/src/processor/postfix_evaluator-inl.h
+++ b/src/processor/postfix_evaluator-inl.h
@@ -131,7 +131,7 @@ bool PostfixEvaluator<ValueType>::EvaluateInternal(
break;
case BINARY_OP_ALIGN:
result =
- operand1 & (reinterpret_cast<ValueType>(-1) ^ (operand2 - 1));
+ operand1 & (static_cast<ValueType>(-1) ^ (operand2 - 1));
break;
case BINARY_OP_NONE:
// This will not happen, but compilers will want a default or