Fix some more pedantic compiler warnings.
Argument name shadows field name.
Lack of case statements for kMips64.
Change-Id: Ib3ca16f79a4d44ae80ef32f22cc79cbe9527f4f1
diff --git a/runtime/base/logging.h b/runtime/base/logging.h
index caeb946..cf3e763 100644
--- a/runtime/base/logging.h
+++ b/runtime/base/logging.h
@@ -151,7 +151,7 @@
template <typename LHS, typename RHS>
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 @@
// protect you against combinations not explicitly listed below.
#define EAGER_PTR_EVALUATOR(T1, T2) \
template <> struct EagerEvaluator<T1, T2> { \
- EagerEvaluator(T1 lhs, T2 rhs) \
- : lhs(reinterpret_cast<const void*>(lhs)), \
- rhs(reinterpret_cast<const void*>(rhs)) { } \
+ EagerEvaluator(T1 l, T2 r) \
+ : lhs(reinterpret_cast<const void*>(l)), \
+ rhs(reinterpret_cast<const void*>(r)) { } \
const void* lhs; \
const void* rhs; \
}
diff --git a/runtime/instruction_set.h b/runtime/instruction_set.h
index ae8eeac..de6d0f4 100644
--- a/runtime/instruction_set.h
+++ b/runtime/instruction_set.h
@@ -56,6 +56,7 @@
static constexpr size_t kArmPointerSize = 4;
static constexpr size_t kArm64PointerSize = 8;
static constexpr size_t kMipsPointerSize = 4;
+static constexpr size_t kMips64PointerSize = 8;
static constexpr size_t kX86PointerSize = 4;
static constexpr size_t kX86_64PointerSize = 8;
@@ -93,6 +94,8 @@
return kX86_64PointerSize;
case kMips:
return kMipsPointerSize;
+ case kMips64:
+ return kMips64PointerSize;
case kNone:
LOG(FATAL) << "ISA kNone does not have pointer size.";
return 0;
@@ -114,6 +117,7 @@
case kArm64:
case kX86_64:
+ case kMips64:
return true;
case kNone: