diff options
| author |  kpayson64 <kpayson@google.com> | 2016-07-25 14:32:51 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-25 14:32:51 -0700 |
| commit | b5fa72c89e07c3a4a6730d3adf108ce9cfc33d78 (patch) | |
| tree | ea1866ce9257dbaaddf365a2c9a7a813c4fa0a2c /include | |
| parent | de2d9fc07bf7f01184c6bfebb7ed12da8eade525 (diff) | |
| parent | 26100cb1fecc20df4ac0afced747665e48bcc91d (diff) | |
Merge pull request #7451 from y-zeng/seperate_generated_files
Separate generated pb files from the server reflection build target, use grpc::protobuf instead of google::protobuf
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc++/impl/codegen/config_protobuf.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/grpc++/impl/codegen/config_protobuf.h b/include/grpc++/impl/codegen/config_protobuf.h index 6ab67721e5..8620d4b218 100644 --- a/include/grpc++/impl/codegen/config_protobuf.h +++ b/include/grpc++/impl/codegen/config_protobuf.h @@ -62,6 +62,13 @@ #define GRPC_CUSTOM_SOURCELOCATION ::google::protobuf::SourceLocation #endif +#ifndef GRPC_CUSTOM_DESCRIPTORDATABASE +#include <google/protobuf/descriptor_database.h> +#define GRPC_CUSTOM_DESCRIPTORDATABASE ::google::protobuf::DescriptorDatabase +#define GRPC_CUSTOM_SIMPLEDESCRIPTORDATABASE \ + ::google::protobuf::SimpleDescriptorDatabase +#endif + #ifndef GRPC_CUSTOM_ZEROCOPYOUTPUTSTREAM #include <google/protobuf/io/coded_stream.h> #include <google/protobuf/io/zero_copy_stream.h> @@ -80,11 +87,13 @@ typedef GRPC_CUSTOM_PROTOBUF_INT64 int64; typedef GRPC_CUSTOM_DESCRIPTOR Descriptor; typedef GRPC_CUSTOM_DESCRIPTORPOOL DescriptorPool; +typedef GRPC_CUSTOM_DESCRIPTORDATABASE DescriptorDatabase; typedef GRPC_CUSTOM_FIELDDESCRIPTOR FieldDescriptor; typedef GRPC_CUSTOM_FILEDESCRIPTOR FileDescriptor; typedef GRPC_CUSTOM_FILEDESCRIPTORPROTO FileDescriptorProto; typedef GRPC_CUSTOM_METHODDESCRIPTOR MethodDescriptor; typedef GRPC_CUSTOM_SERVICEDESCRIPTOR ServiceDescriptor; +typedef GRPC_CUSTOM_SIMPLEDESCRIPTORDATABASE SimpleDescriptorDatabase; typedef GRPC_CUSTOM_SOURCELOCATION SourceLocation; namespace io { |