Merge branch 'yawn' into proto_names

2 files changed, 5 insertions, 3 deletions

diff --git a/test/cpp/end2end/zookeeper_test.cc b/test/cpp/end2end/zookeeper_test.cc
index 4044624b73..802df6bb94 100644
--- a/test/cpp/end2end/zookeeper_test.cc
+++ b/test/cpp/end2end/zookeeper_test.cc
@@ -157,7 +157,7 @@ class ZookeeperTest : public ::testing::Test {
   void ResetStub() {
     string target = "zookeeper://" + zookeeper_address_ + "/test";
     channel_ = CreateChannel(target, InsecureChannelCredentials());
-    stub_ = std::move(grpc::testing::TestService::NewStub(channel_));
+    stub_ = grpc::testing::TestService::NewStub(channel_);
   }
 
   string to_string(const int number) {
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);
 }