diff options
| author |  yang-g <yangg@google.com> | 2016-06-03 15:21:15 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-06-03 15:21:15 -0700 |
| commit | 17487f9a22bd57fa05a0b4196bbb19f62ef7eb6c (patch) | |
| tree | e125238a41ea9c8acd39f2bda1c372b45c20816b /src/compiler/config.h | |
| parent | 2ff798629c64cabf0810f030c6eaed14efca60f2 (diff) | |
Make grpc++ independent of protobuf
Diffstat (limited to 'src/compiler/config.h')
| -rw-r--r-- | src/compiler/config.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/compiler/config.h b/src/compiler/config.h index d8b95818db..f2abb85186 100644 --- a/src/compiler/config.h +++ b/src/compiler/config.h @@ -34,8 +34,7 @@ #ifndef SRC_COMPILER_CONFIG_H #define SRC_COMPILER_CONFIG_H -#include <grpc++/support/config.h> -#include <grpc++/support/config_protobuf.h> +#include <grpc++/impl/codegen/config_protobuf.h> #ifndef GRPC_CUSTOM_DESCRIPTOR #include <google/protobuf/descriptor.h> @@ -75,7 +74,15 @@ #define GRPC_CUSTOM_PARSEGENERATORPARAMETER ::google::protobuf::compiler::ParseGeneratorParameter #endif +#ifndef GRPC_CUSTOM_STRING +#include <string> +#define GRPC_CUSTOM_STRING std::string +#endif + namespace grpc { + +typedef GRPC_CUSTOM_STRING string; + namespace protobuf { typedef GRPC_CUSTOM_DESCRIPTOR Descriptor; typedef GRPC_CUSTOM_FILEDESCRIPTOR FileDescriptor; |