diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-06-03 13:41:46 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-06-03 13:41:46 -0700 |
| commit | 3623dc5cddaee5884c73c9e5c79f80f25e7d3dbe (patch) | |
| tree | de859343450196af8d2944ea6e9bda091a5ecc10 /src/compiler/config.h | |
| parent | ea09adc84b89b7c7bf22f46c87c311a515f3144f (diff) | |
Move protobuf dependencies to config_protobuf.h
Diffstat (limited to 'src/compiler/config.h')
| -rw-r--r-- | src/compiler/config.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/compiler/config.h b/src/compiler/config.h index d8b95818db..631adbc5c1 100644 --- a/src/compiler/config.h +++ b/src/compiler/config.h @@ -37,17 +37,6 @@ #include <grpc++/support/config.h> #include <grpc++/support/config_protobuf.h> -#ifndef GRPC_CUSTOM_DESCRIPTOR -#include <google/protobuf/descriptor.h> -#include <google/protobuf/descriptor.pb.h> -#define GRPC_CUSTOM_DESCRIPTOR ::google::protobuf::Descriptor -#define GRPC_CUSTOM_FILEDESCRIPTOR ::google::protobuf::FileDescriptor -#define GRPC_CUSTOM_FILEDESCRIPTORPROTO ::google::protobuf::FileDescriptorProto -#define GRPC_CUSTOM_METHODDESCRIPTOR ::google::protobuf::MethodDescriptor -#define GRPC_CUSTOM_SERVICEDESCRIPTOR ::google::protobuf::ServiceDescriptor -#define GRPC_CUSTOM_SOURCELOCATION ::google::protobuf::SourceLocation -#endif - #ifndef GRPC_CUSTOM_CODEGENERATOR #include <google/protobuf/compiler/code_generator.h> #define GRPC_CUSTOM_CODEGENERATOR ::google::protobuf::compiler::CodeGenerator @@ -77,12 +66,7 @@ namespace grpc { namespace protobuf { -typedef GRPC_CUSTOM_DESCRIPTOR Descriptor; -typedef GRPC_CUSTOM_FILEDESCRIPTOR FileDescriptor; -typedef GRPC_CUSTOM_FILEDESCRIPTORPROTO FileDescriptorProto; -typedef GRPC_CUSTOM_METHODDESCRIPTOR MethodDescriptor; -typedef GRPC_CUSTOM_SERVICEDESCRIPTOR ServiceDescriptor; -typedef GRPC_CUSTOM_SOURCELOCATION SourceLocation; + namespace compiler { typedef GRPC_CUSTOM_CODEGENERATOR CodeGenerator; typedef GRPC_CUSTOM_GENERATORCONTEXT GeneratorContext; |