diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-20 21:37:13 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-20 21:37:13 -0700 |
| commit | 60fb20127778d98dd4b0ce0ef5a35fd01aa4687f (patch) | |
| tree | f94471e37b99f1252f51f9ab99e4899dcb8e6d40 /src/cpp/client | |
| parent | b4fdd321003a2fa2b6c1ba5baee7ed9e70b17a23 (diff) | |
| parent | 40d808ffdc00831fdb31f7ed11610a21854a18ee (diff) | |
Merge github.com:grpc/grpc into now-i-get-to-show-it-to-EVERYBODY
Conflicts:
src/cpp/client/channel_arguments.cc
Diffstat (limited to 'src/cpp/client')
| -rw-r--r-- | src/cpp/client/channel_arguments.cc | 2 | ||||
| -rw-r--r-- | src/cpp/client/client_context.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cpp/client/channel_arguments.cc b/src/cpp/client/channel_arguments.cc index 3a151c70c8..da6602e7af 100644 --- a/src/cpp/client/channel_arguments.cc +++ b/src/cpp/client/channel_arguments.cc @@ -75,7 +75,7 @@ void ChannelArguments::Swap(ChannelArguments& other) { strings_.swap(other.strings_); } -void ChannelArguments::_Experimental_SetCompressionAlgorithm( +void ChannelArguments::SetCompressionAlgorithm( grpc_compression_algorithm algorithm) { SetInt(GRPC_COMPRESSION_ALGORITHM_ARG, algorithm); } diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc index 69216d2030..14ab772e50 100644 --- a/src/cpp/client/client_context.cc +++ b/src/cpp/client/client_context.cc @@ -79,7 +79,7 @@ void ClientContext::set_call(grpc_call* call, } } -void ClientContext::_experimental_set_compression_algorithm( +void ClientContext::set_compression_algorithm( grpc_compression_algorithm algorithm) { char* algorithm_name = NULL; if (!grpc_compression_algorithm_name(algorithm, &algorithm_name)) { |