diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-07-21 16:15:12 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-07-21 16:15:12 -0700 |
| commit | 2edf5e904b5676807def8b1213476a76819267e1 (patch) | |
| tree | f579465e62a89fa0e418f42badc52b278dac99ce /include | |
| parent | 12c3811167fc33ab9921f14f00066da35a163b21 (diff) | |
| parent | b8e26c021718758c2a0b2e73757580476d995498 (diff) | |
Merge remote-tracking branch 'upstream/master' into seperate_generated_files
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc++/impl/codegen/client_context.h | 2 | ||||
| -rw-r--r-- | include/grpc++/impl/codegen/config_protobuf.h | 5 |
2 files changed, 6 insertions, 1 deletions
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. diff --git a/include/grpc++/impl/codegen/config_protobuf.h b/include/grpc++/impl/codegen/config_protobuf.h index ea7b977791..8620d4b218 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 <google/protobuf/message_lite.h> +#define GRPC_CUSTOM_MESSAGE ::google::protobuf::MessageLite +#else #include <google/protobuf/message.h> #define GRPC_CUSTOM_MESSAGE ::google::protobuf::Message #endif +#endif #ifndef GRPC_CUSTOM_DESCRIPTOR #include <google/protobuf/descriptor.h> |