commit 1eeb00c7499c520159a38af4be3835aee7ee7b38
author Andreas Gampe <agampe@google.com> Thu Nov 03 08:19:01 2016 -0700
committer Andreas Gampe <agampe@google.com> Thu Nov 03 11:16:36 2016 -0700
tree b3633fdf5f7e94674970be7321f86640e90452c8
parent c64789734890c86ac772b1963b35ad21d17e44c3

ART: Change iterator value type to match

Make keys const.

Bug: 32619234
Test: m
Change-Id: I240341a0fec79754bea2ed21c0d0a4ddd119ce35

runtime/hprof/hprof.cc

diff --git a/runtime/hprof/hprof.cc b/runtime/hprof/hprof.cc
index 2336759..8cbe491 100644
--- a/runtime/hprof/hprof.cc
+++ b/runtime/hprof/hprof.cc
@@ -574,9 +574,9 @@
   }
 
   void WriteStringTable() {
-    for (const std::pair<std::string, HprofStringId>& p : strings_) {
+    for (const auto& p : strings_) {
       const std::string& string = p.first;
-      const size_t id = p.second;
+      const HprofStringId id = p.second;
 
       output_->StartNewRecord(HPROF_TAG_STRING, kHprofTime);
 

runtime/verifier/register_line.cc

diff --git a/runtime/verifier/register_line.cc b/runtime/verifier/register_line.cc
index 4ec2da6..da3d946 100644
--- a/runtime/verifier/register_line.cc
+++ b/runtime/verifier/register_line.cc
@@ -411,7 +411,7 @@
   }
 
   // Scan the map for the same value.
-  for (const std::pair<uint32_t, uint32_t>& pair : search_map) {
+  for (const std::pair<const uint32_t, uint32_t>& pair : search_map) {
     if (pair.first != src && pair.second == src_lock_levels) {
       return true;
     }