diff options
| author |  Yuchen Zeng <zyc@google.com> | 2017-01-19 16:33:30 -0800 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2017-01-19 16:33:30 -0800 |
| commit | e02cbebd025d94033994abab136ed980c3213d95 (patch) | |
| tree | 01920e20a91613ff51bc3162e2df4ee0f2e3106f /include | |
| parent | 2ef172b15bfb52bd90a80de712be009a5f0a5b92 (diff) | |
| parent | fffb692d37867f040b2b7bb2e982d5137dfb123e (diff) | |
Merge remote-tracking branch 'upstream/master' into cares_buildin
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc++/impl/codegen/config.h | 6 | ||||
| -rw-r--r-- | include/grpc++/support/channel_arguments.h | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/grpc++/impl/codegen/config.h b/include/grpc++/impl/codegen/config.h index af3ee5a4cf..a43bf65f91 100644 --- a/include/grpc++/impl/codegen/config.h +++ b/include/grpc++/impl/codegen/config.h @@ -39,6 +39,12 @@ #define GRPC_CUSTOM_STRING std::string #endif +// The following macros are deprecated and appear only for users +// with PB files generated using gRPC 1.0.x plugins. They should +// not be used in new code +#define GRPC_OVERRIDE override // deprecated +#define GRPC_FINAL final // deprecated + namespace grpc { typedef GRPC_CUSTOM_STRING string; diff --git a/include/grpc++/support/channel_arguments.h b/include/grpc++/support/channel_arguments.h index d43f7c61bd..efdf7772ad 100644 --- a/include/grpc++/support/channel_arguments.h +++ b/include/grpc++/support/channel_arguments.h @@ -88,6 +88,10 @@ class ChannelArguments { /// The given buffer pool will be attached to the constructed channel void SetResourceQuota(const ResourceQuota& resource_quota); + /// Sets the max receive and send message sizes. + void SetMaxReceiveMessageSize(int size); + void SetMaxSendMessageSize(int size); + /// Set LB policy name. /// Note that if the name resolver returns only balancer addresses, the /// grpclb LB policy will be used, regardless of what is specified here. |