diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-07-20 16:16:35 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-07-20 16:16:35 -0700 |
| commit | 4524942f299cbb3f7427745d9c6f74e21670d687 (patch) | |
| tree | ef69d2f83ef72184be96dda2230c1f727024c34d /src/cpp | |
| parent | 1b22b9db94784bc589d372e2b30eb939d009c3d9 (diff) | |
| parent | aabf72c21806d59efe8999268e1dc363ef845d85 (diff) | |
Merge github.com:grpc/grpc into tell-me-who-you-might-be
Diffstat (limited to 'src/cpp')
| -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 92ac5ea6fd..4263e377a8 100644 --- a/src/cpp/client/channel_arguments.cc +++ b/src/cpp/client/channel_arguments.cc @@ -37,7 +37,7 @@ namespace grpc { -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)) { |