From 0e3f1f1e5312b9d20b97642f5c81104ad05a370d Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Tue, 22 Nov 2016 12:28:14 -0800 Subject: [PATCH 1/2] Support compat with old generated PB files --- include/grpc++/impl/codegen/config.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/grpc++/impl/codegen/config.h b/include/grpc++/impl/codegen/config.h index af3ee5a4cf8..a43bf65f913 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; From 00ac6288fd5be1100310fcead8f46d199da4c823 Mon Sep 17 00:00:00 2001 From: Nathaniel Manista Date: Tue, 17 Jan 2017 23:40:38 +0000 Subject: [PATCH 2/2] =?UTF-8?q?pyformat=5Fcode.sh=20=E2=86=92=20yapf=5Fcod?= =?UTF-8?q?e.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should have been a part of 06dea573daa2175b244a430bb89b49bb5c8e8. --- tools/distrib/{pyformat_code.sh => yapf_code.sh} | 0 tools/run_tests/sanity/sanity_tests.yaml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename tools/distrib/{pyformat_code.sh => yapf_code.sh} (100%) diff --git a/tools/distrib/pyformat_code.sh b/tools/distrib/yapf_code.sh similarity index 100% rename from tools/distrib/pyformat_code.sh rename to tools/distrib/yapf_code.sh diff --git a/tools/run_tests/sanity/sanity_tests.yaml b/tools/run_tests/sanity/sanity_tests.yaml index f29b700572b..ce41da802d0 100644 --- a/tools/run_tests/sanity/sanity_tests.yaml +++ b/tools/run_tests/sanity/sanity_tests.yaml @@ -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