From e6c04aa6126d3de7e27c86b2086b00d5353011ed Mon Sep 17 00:00:00 2001 From: yang-g Date: Tue, 19 Jul 2016 14:46:50 -0700 Subject: Add a macro to support protobuf lite --- include/grpc++/impl/codegen/config_protobuf.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/grpc++') diff --git a/include/grpc++/impl/codegen/config_protobuf.h b/include/grpc++/impl/codegen/config_protobuf.h index 4bee1bc422..e1198f0ea0 100644 --- a/include/grpc++/impl/codegen/config_protobuf.h +++ b/include/grpc++/impl/codegen/config_protobuf.h @@ -40,9 +40,14 @@ #endif #ifndef GRPC_CUSTOM_MESSAGE +#ifdef GRPC_USE_PROTO_LITE +#include +#define GRPC_CUSTOM_MESSAGE ::google::protobuf::MessageLite +#else #include #define GRPC_CUSTOM_MESSAGE ::google::protobuf::Message #endif +#endif #ifndef GRPC_CUSTOM_DESCRIPTOR #include -- cgit v1.2.3 From b91cddb2fa41df52a9e7ddef2d5ba7097b7c4cdc Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Wed, 20 Jul 2016 17:40:01 -0700 Subject: fixed typo --- include/grpc++/impl/codegen/client_context.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/grpc++') diff --git a/include/grpc++/impl/codegen/client_context.h b/include/grpc++/impl/codegen/client_context.h index a132c9a57a..012bcc2bbe 100644 --- a/include/grpc++/impl/codegen/client_context.h +++ b/include/grpc++/impl/codegen/client_context.h @@ -41,7 +41,7 @@ /// /// Context settings are only relevant to the call they are invoked with, that /// is to say, they aren't sticky. Some of these settings, such as the -/// compression options, can be made persistant at channel construction time +/// compression options, can be made persistent at channel construction time /// (see \a grpc::CreateCustomChannel). /// /// \warning ClientContext instances should \em not be reused across rpcs. -- cgit v1.2.3