aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/cpp/end2end
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-11-04 07:29:22 -0800
committerGravatar Craig Tiller <ctiller@google.com>2015-11-04 07:29:22 -0800
commita147aee75a37249b4f19c5d47204fdd6779bbd82 (patch)
tree73542428a403bc014b84c3bcf8699bd8405d6885 /test/cpp/end2end
parent32bd81d2058d70be256f0dce2d1bfa2b5818bb8f (diff)
parent241a5ad3cbb921e99f2ba45789d3acf65a5a845a (diff)
Merge github.com:grpc/grpc into new_op
Diffstat (limited to 'test/cpp/end2end')
-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_);