Skip to content
Snippets Groups Projects
Commit b2fa3d3b authored by ncteisen's avatar ncteisen
Browse files

Merge branch 'master' of https://github.com/grpc/grpc into cpp_stress_flags

parents c51f19d6 e8338a56
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
File moved
......@@ -12,6 +12,6 @@
- script: tools/distrib/check_trailing_newlines.sh
- script: tools/distrib/check_nanopb_output.sh
- script: tools/distrib/check_include_guards.py
- script: tools/distrib/pyformat_code.sh
- script: tools/distrib/yapf_code.sh
- script: tools/distrib/python/check_grpcio_tools.py
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment