diff options
| author | Jeong YunWon <youknowone@users.noreply.github.com> | 2021-03-26 04:12:35 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 12:12:35 -0700 |
| commit | 276b1bc342d23142e4b2b9b9fadbf076474deec9 (patch) | |
| tree | 11aa2c405876cb0c50e410ccf251fd250b1ca2dc /include | |
| parent | 124654ffc4ef8ee8a67aca8af3d9a6e58bd38f59 (diff) | |
| download | flatbuffers-276b1bc342d23142e4b2b9b9fadbf076474deec9.tar.gz flatbuffers-276b1bc342d23142e4b2b9b9fadbf076474deec9.tar.bz2 flatbuffers-276b1bc342d23142e4b2b9b9fadbf076474deec9.zip | |
[grpc] Support latest version of grpc PoC (#6338)
* use grpcpp rather than deprecated grpc++
* grpcpp Deserialize take ByteBuffer instead of grpc_byte_buffer
* grpc 1.36.0
* Fix to use grpc 1.36.0
* Fix CMakeLists to refer gRPC
* add find_package(Threads)
* Update bazel deps
* Apply workaround about boringssl build error
* Install latest cmake for osx on travis-ci
Co-authored-by: Yeom Gyusun <omniavinco@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/flatbuffers/grpc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/flatbuffers/grpc.h b/include/flatbuffers/grpc.h index bd24c501..b7935551 100644 --- a/include/flatbuffers/grpc.h +++ b/include/flatbuffers/grpc.h @@ -20,8 +20,8 @@ // Helper functionality to glue FlatBuffers and GRPC. #include "flatbuffers/flatbuffers.h" -#include "grpc++/support/byte_buffer.h" #include "grpc/byte_buffer_reader.h" +#include "grpcpp/support/byte_buffer.h" namespace flatbuffers { namespace grpc { @@ -287,8 +287,9 @@ template<class T> class SerializationTraits<flatbuffers::grpc::Message<T>> { } // Deserialize by pulling the - static grpc::Status Deserialize(grpc_byte_buffer *buffer, + static grpc::Status Deserialize(ByteBuffer *buf, flatbuffers::grpc::Message<T> *msg) { + grpc_byte_buffer *buffer = *reinterpret_cast<grpc_byte_buffer **>(buf); if (!buffer) { return ::grpc::Status(::grpc::StatusCode::INTERNAL, "No payload"); } |