diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-06-04 08:51:17 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-06-04 08:51:17 -0700 |
| commit | 81fafa8971d3dc1a070dd77834dc120974a62418 (patch) | |
| tree | 7ba6ac5c1ae0e17590779507020d31e7a7e3dbd6 /include/grpc++/config.h | |
| parent | da11694971f12ee973e84c9386494a161228e51a (diff) | |
Beginning the cleanup
Diffstat (limited to 'include/grpc++/config.h')
| -rw-r--r-- | include/grpc++/config.h | 45 |
1 files changed, 5 insertions, 40 deletions
diff --git a/include/grpc++/config.h b/include/grpc++/config.h index 55b2a64482..af248b66e3 100644 --- a/include/grpc++/config.h +++ b/include/grpc++/config.h @@ -77,33 +77,6 @@ #define GRPC_OVERRIDE override #endif -#ifndef GRPC_CUSTOM_PROTOBUF_INT64 -#include <google/protobuf/stubs/common.h> -#define GRPC_CUSTOM_PROTOBUF_INT64 ::google::protobuf::int64 -#endif - -#ifndef GRPC_CUSTOM_MESSAGE -#include <google/protobuf/message.h> -#define GRPC_CUSTOM_MESSAGE ::google::protobuf::Message -#endif - -#ifndef GRPC_CUSTOM_STRING -#include <string> -#define GRPC_CUSTOM_STRING std::string -#endif - -#ifndef GRPC_CUSTOM_ZEROCOPYOUTPUTSTREAM -#include <google/protobuf/io/coded_stream.h> -#include <google/protobuf/io/zero_copy_stream.h> -#define GRPC_CUSTOM_ZEROCOPYOUTPUTSTREAM \ - ::google::protobuf::io::ZeroCopyOutputStream -#define GRPC_CUSTOM_ZEROCOPYINPUTSTREAM \ - ::google::protobuf::io::ZeroCopyInputStream -#define GRPC_CUSTOM_CODEDINPUTSTREAM \ - ::google::protobuf::io::CodedInputStream -#endif - - #ifdef GRPC_CXX0X_NO_NULLPTR #include <memory> const class { @@ -121,23 +94,15 @@ private: } nullptr = {}; #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_MESSAGE Message; -typedef GRPC_CUSTOM_PROTOBUF_INT64 int64; - -namespace io { -typedef GRPC_CUSTOM_ZEROCOPYOUTPUTSTREAM ZeroCopyOutputStream; -typedef GRPC_CUSTOM_ZEROCOPYINPUTSTREAM ZeroCopyInputStream; -typedef GRPC_CUSTOM_CODEDINPUTSTREAM CodedInputStream; -} // namespace io - -} // namespace protobuf - } // namespace grpc #endif // GRPCXX_CONFIG_H |