commit b256faa353159c0b6f3477777bed75b4f9de3e16
author Craig Tiller <ctiller@google.com> Thu Jul 23 11:28:16 2015 -0700
committer Craig Tiller <ctiller@google.com> Thu Jul 23 11:28:16 2015 -0700
tree 75c07077be01aa0120dc7b00dc5bdf88c51c87f6
parent b358c41c7e901e170de7621c682b845469f4f667
parent 5126bb6d8261ef07fb8132d5b5937f149cf315c8

Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other

test/cpp/client/credentials_test.cc

diff --git a/test/cpp/client/credentials_test.cc b/test/cpp/client/credentials_test.cc
index ee94f45..6fb24d7 100644
--- a/test/cpp/client/credentials_test.cc
+++ b/test/cpp/client/credentials_test.cc
@@ -47,7 +47,7 @@
 
 TEST_F(CredentialsTest, InvalidServiceAccountCreds) {
   std::shared_ptr<Credentials> bad1 = ServiceAccountCredentials("", "", 1);
-  EXPECT_EQ(nullptr, bad1.get());
+  EXPECT_EQ(static_cast<Credentials*>(nullptr), bad1.get());
 }
 
 }  // namespace testing