diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-01-20 11:31:47 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-01-20 11:31:47 -0800 |
| commit | b7b7486c4bbe2351702fff76cae59292060fe9e4 (patch) | |
| tree | b2dd81edc3625a5299ed2282141c441b0b4a789d /include/grpc++/impl/codegen | |
| parent | 4906d2c4b1d86a881d86e53f1d6be400f4421e5f (diff) | |
| parent | bd827887ffbb57a95990130f585913b13f44a5b7 (diff) | |
Merge github.com:grpc/grpc into metadata_filter
Diffstat (limited to 'include/grpc++/impl/codegen')
| -rw-r--r-- | include/grpc++/impl/codegen/config.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/grpc++/impl/codegen/config.h b/include/grpc++/impl/codegen/config.h index af3ee5a4cf..a43bf65f91 100644 --- a/include/grpc++/impl/codegen/config.h +++ b/include/grpc++/impl/codegen/config.h @@ -39,6 +39,12 @@ #define GRPC_CUSTOM_STRING std::string #endif +// The following macros are deprecated and appear only for users +// with PB files generated using gRPC 1.0.x plugins. They should +// not be used in new code +#define GRPC_OVERRIDE override // deprecated +#define GRPC_FINAL final // deprecated + namespace grpc { typedef GRPC_CUSTOM_STRING string; |