diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-14 13:14:10 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-14 13:14:10 -0700 |
| commit | 2c6f63731c7ddc761eac80be7609a9e80116ddee (patch) | |
| tree | 02896c6cbbacb3e8931a347166abf7538187d255 /src/cpp/common | |
| parent | 694cd708313945c31e4b2c1b518d3cff80f8b031 (diff) | |
| parent | e412a180602753972ac496560322e224a5db987f (diff) | |
Merge github.com:grpc/grpc into cpparena
Diffstat (limited to 'src/cpp/common')
| -rw-r--r-- | src/cpp/common/core_codegen.cc | 9 | ||||
| -rw-r--r-- | src/cpp/common/version_cc.cc | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/cpp/common/core_codegen.cc b/src/cpp/common/core_codegen.cc index 88a7968b9b..4f8b826aec 100644 --- a/src/cpp/common/core_codegen.cc +++ b/src/cpp/common/core_codegen.cc @@ -54,9 +54,14 @@ struct grpc_byte_buffer; namespace grpc { -grpc_completion_queue* CoreCodegen::grpc_completion_queue_create( +grpc_completion_queue* CoreCodegen::grpc_completion_queue_create_for_next( void* reserved) { - return ::grpc_completion_queue_create(reserved); + return ::grpc_completion_queue_create_for_next(reserved); +} + +grpc_completion_queue* CoreCodegen::grpc_completion_queue_create_for_pluck( + void* reserved) { + return ::grpc_completion_queue_create_for_pluck(reserved); } void CoreCodegen::grpc_completion_queue_destroy(grpc_completion_queue* cq) { diff --git a/src/cpp/common/version_cc.cc b/src/cpp/common/version_cc.cc index f5a0e4131d..72a4c4cf94 100644 --- a/src/cpp/common/version_cc.cc +++ b/src/cpp/common/version_cc.cc @@ -37,5 +37,5 @@ #include <grpc++/grpc++.h> namespace grpc { -grpc::string Version() { return "1.3.0-dev"; } +grpc::string Version() { return "1.4.0-dev"; } } |