From 02875c56e80500fb0cc4671e33f57968232222ee Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Thu, 25 Sep 2014 17:36:39 -0700 Subject: Fix some more pedantic compiler warnings. Argument name shadows field name. Lack of case statements for kMips64. Change-Id: Ib3ca16f79a4d44ae80ef32f22cc79cbe9527f4f1 --- runtime/base/logging.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'runtime/base/logging.h') diff --git a/runtime/base/logging.h b/runtime/base/logging.h index caeb946ff0..cf3e763f1e 100644 --- a/runtime/base/logging.h +++ b/runtime/base/logging.h @@ -151,7 +151,7 @@ namespace art { template struct EagerEvaluator { - EagerEvaluator(LHS lhs, RHS rhs) : lhs(lhs), rhs(rhs) { } + EagerEvaluator(LHS l, RHS r) : lhs(l), rhs(r) { } LHS lhs; RHS rhs; }; @@ -163,9 +163,9 @@ struct EagerEvaluator { // protect you against combinations not explicitly listed below. #define EAGER_PTR_EVALUATOR(T1, T2) \ template <> struct EagerEvaluator { \ - EagerEvaluator(T1 lhs, T2 rhs) \ - : lhs(reinterpret_cast(lhs)), \ - rhs(reinterpret_cast(rhs)) { } \ + EagerEvaluator(T1 l, T2 r) \ + : lhs(reinterpret_cast(l)), \ + rhs(reinterpret_cast(r)) { } \ const void* lhs; \ const void* rhs; \ } -- cgit v1.2.3