diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-07-23 11:28:16 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-07-23 11:28:16 -0700 |
| commit | b256faa353159c0b6f3477777bed75b4f9de3e16 (patch) | |
| tree | 75c07077be01aa0120dc7b00dc5bdf88c51c87f6 /test/cpp/end2end | |
| parent | b358c41c7e901e170de7621c682b845469f4f667 (diff) | |
| parent | 5126bb6d8261ef07fb8132d5b5937f149cf315c8 (diff) | |
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
Diffstat (limited to 'test/cpp/end2end')
| -rw-r--r-- | test/cpp/end2end/end2end_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index a865a0e359..616142b14e 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -509,7 +509,7 @@ TEST_F(End2endTest, DiffPackageServices) { // rpc and stream should fail on bad credentials. TEST_F(End2endTest, BadCredentials) { std::shared_ptr<Credentials> bad_creds = ServiceAccountCredentials("", "", 1); - EXPECT_EQ(nullptr, bad_creds.get()); + EXPECT_EQ(static_cast<Credentials*>(nullptr), bad_creds.get()); std::shared_ptr<ChannelInterface> channel = CreateChannel(server_address_.str(), bad_creds, ChannelArguments()); std::unique_ptr<grpc::cpp::test::util::TestService::Stub> stub( |