diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-21 09:04:06 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-21 09:04:06 -0700 |
| commit | 44654553de6edffa61f60f725dacbcdb89bdca72 (patch) | |
| tree | f80eb479b9991c2da5650202dbb160d3f34b2cf2 /src/cpp | |
| parent | c65af4d78477cc415822305e8256750ec4cb55e3 (diff) | |
| parent | 6e96e5ccab41a1378a6c9bf4043206ddb0840f48 (diff) | |
Merge github.com:grpc/grpc into idempotent
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/README.md | 4 | ||||
| -rw-r--r-- | src/cpp/client/secure_credentials.cc | 3 | ||||
| -rw-r--r-- | src/cpp/server/server_context.cc | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/cpp/README.md b/src/cpp/README.md index 83d37aa2ed..f2935e52d9 100644 --- a/src/cpp/README.md +++ b/src/cpp/README.md @@ -61,7 +61,7 @@ below. #Documentation You can find out how to build and run our simplest gRPC C++ example in our -[C++ quick start](https://github.com/grpc/grpc/tree/{{ site.data.config.grpc_release_branch }}/examples/cpp). +[C++ quick start](../../examples/cpp). For more detailed documentation on using gRPC in C++ , see our main documentation site at [grpc.io](http://grpc.io), specifically: @@ -79,4 +79,4 @@ documentation site at [grpc.io](http://grpc.io), specifically: # Examples Code examples for gRPC C++ live in this repository's -[examples/cpp](https://github.com/grpc/grpc/tree/{{ site.data.config.grpc_release_branch }}/examples/cpp) directory. +[examples/cpp](../../examples/cpp) directory. diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc index 308455527c..c34b840f90 100644 --- a/src/cpp/client/secure_credentials.cc +++ b/src/cpp/client/secure_credentials.cc @@ -60,8 +60,7 @@ std::shared_ptr<grpc::Channel> SecureChannelCredentials::CreateChannel( SecureCallCredentials::SecureCallCredentials(grpc_call_credentials* c_creds) : c_creds_(c_creds) { - internal::GrpcLibraryInitializer gli_initializer; - gli_initializer.summon(); + g_gli_initializer.summon(); } bool SecureCallCredentials::ApplyToCall(grpc_call* call) { diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index eb49b21037..5d12ce2ecf 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -43,6 +43,7 @@ #include <grpc/support/log.h> #include "src/core/channel/compress_filter.h" +#include "src/core/surface/call.h" #include "src/cpp/common/create_auth_context.h" namespace grpc { @@ -197,7 +198,7 @@ bool ServerContext::IsCancelled() const { void ServerContext::set_compression_level(grpc_compression_level level) { const grpc_compression_algorithm algorithm_for_level = - grpc_compression_algorithm_for_level(level); + grpc_call_compression_for_level(call_, level); set_compression_algorithm(algorithm_for_level); } |