aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar vjpai <vpai@google.com>2015-11-02 14:50:28 -0800
committerGravatar vjpai <vpai@google.com>2015-11-02 14:50:28 -0800
commit9b14e15165e3fa0ab183453bdf30fd6f84ccc594 (patch)
treed36cded459a88ce52b5ec2b09be39e8b60cb7d2e
parentaa39192d70ca4b9e0f63994c595545130b6c6224 (diff)
parent6bf1de9ab2b324156d766a2f2da14a5d75eae379 (diff)
Merge commit '6bf1de9' into protosplit
-rw-r--r--test/cpp/end2end/mock_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/cpp/end2end/mock_test.cc b/test/cpp/end2end/mock_test.cc
index 9c35fede8f..80057d893e 100644
--- a/test/cpp/end2end/mock_test.cc
+++ b/test/cpp/end2end/mock_test.cc
@@ -62,7 +62,7 @@ template <class W, class R>
class MockClientReaderWriter GRPC_FINAL
: public ClientReaderWriterInterface<W, R> {
public:
- void WaitForInitialMetadata() {}
+ void WaitForInitialMetadata() GRPC_OVERRIDE {}
bool Read(R* msg) GRPC_OVERRIDE { return true; }
bool Write(const W& msg) GRPC_OVERRIDE { return true; }
bool WritesDone() GRPC_OVERRIDE { return true; }
@@ -73,7 +73,7 @@ class MockClientReaderWriter<EchoRequest, EchoResponse> GRPC_FINAL
: public ClientReaderWriterInterface<EchoRequest, EchoResponse> {
public:
MockClientReaderWriter() : writes_done_(false) {}
- void WaitForInitialMetadata() {}
+ void WaitForInitialMetadata() GRPC_OVERRIDE {}
bool Read(EchoResponse* msg) GRPC_OVERRIDE {
if (writes_done_) return false;
msg->set_message(last_message_);