From 92d163e15610ba51dfcb3bc3f9a53fbabf1c426a Mon Sep 17 00:00:00 2001 From: "erik.corry@gmail.com" Date: Wed, 22 Dec 2010 09:49:26 +0000 Subject: [PATCH] Fix a couple of cast errors for gcc-3.4.3. Patch by Ryan Dahl. http://codereview.chromium.org/5976006/ git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@6103 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/ast.h | 2 +- src/deoptimizer.cc | 6 +++--- src/deoptimizer.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ast.h b/src/ast.h index ed447e343a..0e821de876 100644 --- a/src/ast.h +++ b/src/ast.h @@ -1391,7 +1391,7 @@ class BinaryOperation: public Expression { : op_(op), left_(left), right_(right), pos_(pos), is_smi_only_(false) { ASSERT(Token::IsBinaryOp(op)); right_id_ = (op == Token::AND || op == Token::OR) - ? GetNextId() + ? static_cast(GetNextId()) : AstNode::kNoNumber; } diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc index dd70baaa16..185ff92242 100644 --- a/src/deoptimizer.cc +++ b/src/deoptimizer.cc @@ -309,9 +309,9 @@ void Deoptimizer::TearDown() { } -unsigned Deoptimizer::GetOutputInfo(DeoptimizationOutputData* data, - unsigned id, - SharedFunctionInfo* shared) { +int Deoptimizer::GetOutputInfo(DeoptimizationOutputData* data, + unsigned id, + SharedFunctionInfo* shared) { // TODO(kasperl): For now, we do a simple linear search for the PC // offset associated with the given node id. This should probably be // changed to a binary search. diff --git a/src/deoptimizer.h b/src/deoptimizer.h index 2d7dfc895c..f9bf280ea8 100644 --- a/src/deoptimizer.h +++ b/src/deoptimizer.h @@ -145,9 +145,9 @@ class Deoptimizer : public Malloced { static Address GetDeoptimizationEntry(int id, BailoutType type); static int GetDeoptimizationId(Address addr, BailoutType type); - static unsigned GetOutputInfo(DeoptimizationOutputData* data, - unsigned node_id, - SharedFunctionInfo* shared); + static int GetOutputInfo(DeoptimizationOutputData* data, + unsigned node_id, + SharedFunctionInfo* shared); static void Setup(); static void TearDown();