Merge branch 'master' of github.com:grpc/grpc into grpclb_api

1 files changed, 4 insertions, 2 deletions

diff --git a/test/cpp/util/string_ref_test.cc b/test/cpp/util/string_ref_test.cc
index 44a298d892..d94aa5962b 100644
--- a/test/cpp/util/string_ref_test.cc
+++ b/test/cpp/util/string_ref_test.cc
@@ -102,7 +102,8 @@ TEST_F(StringRefTest, Iterator) {
   string_ref s(kTestString);
   size_t i = 0;
   for (auto it = s.cbegin(); it != s.cend(); ++it) {
-    EXPECT_EQ(kTestString[i++], *it);
+    auto val = kTestString[i++];
+    EXPECT_EQ(val, *it);
   }
   EXPECT_EQ(strlen(kTestString), i);
 }
@@ -111,7 +112,8 @@ TEST_F(StringRefTest, ReverseIterator) {
   string_ref s(kTestString);
   size_t i = strlen(kTestString);
   for (auto rit = s.crbegin(); rit != s.crend(); ++rit) {
-    EXPECT_EQ(kTestString[--i], *rit);
+    auto val = kTestString[--i];
+    EXPECT_EQ(val, *rit);
   }
   EXPECT_EQ(0U, i);
 }