diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-11-08 10:56:16 -0800 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-11-08 10:56:16 -0800 |
| commit | bd363544fd5d4d722c068b0ffc0991d7ea6a9277 (patch) | |
| tree | 176fea48dc15ac859b2191fa1d57d4ce33e4a3a0 /src/cpp/ext/proto_server_reflection.h | |
| parent | cc8b841832bba537aaf1c3a6e6dffb91894fe138 (diff) | |
| parent | 24ef07c8afc8d59d9cfe67008bcd2d040467ff20 (diff) | |
Merge remote-tracking branch 'upstream/master' into cares_buildin
Diffstat (limited to 'src/cpp/ext/proto_server_reflection.h')
| -rw-r--r-- | src/cpp/ext/proto_server_reflection.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpp/ext/proto_server_reflection.h b/src/cpp/ext/proto_server_reflection.h index be5f062f9f..ca0ba97d88 100644 --- a/src/cpp/ext/proto_server_reflection.h +++ b/src/cpp/ext/proto_server_reflection.h @@ -42,7 +42,7 @@ namespace grpc { -class ProtoServerReflection GRPC_FINAL +class ProtoServerReflection final : public reflection::v1alpha::ServerReflection::Service { public: ProtoServerReflection(); @@ -56,7 +56,7 @@ class ProtoServerReflection GRPC_FINAL ServerContext* context, ServerReaderWriter<reflection::v1alpha::ServerReflectionResponse, reflection::v1alpha::ServerReflectionRequest>* stream) - GRPC_OVERRIDE; + override; private: Status ListService(ServerContext* context, |