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

pull/8819/head
ncteisen 8 years ago
commit b2fa3d3bff
  1. 6
      include/grpc++/impl/codegen/config.h
  2. 0
      tools/distrib/yapf_code.sh
  3. 2
      tools/run_tests/sanity/sanity_tests.yaml

@ -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;

@ -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

Loading…
Cancel
Save