diff options
| author |  Vijay Pai <vpai@google.com> | 2016-08-30 10:20:20 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2016-08-30 10:20:20 -0700 |
| commit | de2aec810660c39b4fdf047d15b59bda64456373 (patch) | |
| tree | 673ce1f8b9ff1c5ba169237154b7f42a1169bd0b /include/grpc++/ext | |
| parent | 1ce6d33669fd1978f70e5aecb4ccb59fd0d5b2db (diff) | |
| parent | 7684c74b3cb4dc0b9cc631410feeb2aff7a496b8 (diff) | |
Merge branch 'master' into fc_unary
Resolve conflicts in ServerReaderWriterInterface
Remove file server_streamed_unary.h and merge with sync_stream.h
Diffstat (limited to 'include/grpc++/ext')
| -rw-r--r-- | include/grpc++/ext/reflection.grpc.pb.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/grpc++/ext/reflection.grpc.pb.h b/include/grpc++/ext/reflection.grpc.pb.h index 822c2e374a..dbf93f81f3 100644 --- a/include/grpc++/ext/reflection.grpc.pb.h +++ b/include/grpc++/ext/reflection.grpc.pb.h @@ -77,7 +77,6 @@ #include <grpc++/impl/codegen/method_handler_impl.h> #include <grpc++/impl/codegen/proto_utils.h> #include <grpc++/impl/codegen/rpc_method.h> -#include <grpc++/impl/codegen/server_streamed_unary.h> #include <grpc++/impl/codegen/service_type.h> #include <grpc++/impl/codegen/status.h> #include <grpc++/impl/codegen/stub_options.h> |