grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compiler: Swap to ABSL_FALLTHROUGH_INTENDED 

FALLTHROUGH_INTENDED was defined by Abseil, but is now getting an ABSL
prefix and the old name will be removed. Swapping to a new define name
to avoid redefining the existing-but-soon-to-be-deleted
FALLTHROUGH_INTENDED.
This commit is contained in:
Eric Anderson 2020-08-06 08:18:40 -07:00 committed by Eric Anderson
parent 8c4088a9e9
commit f59c9a9c6b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/src/java_plugin/cpp/java_generator.cpp
View File

@ -37,8 +37,10 @@
#define XSTR(s) STR(s) #define XSTR(s) STR(s)
#endif #endif
#ifndef FALLTHROUGH_INTENDED #ifdef ABSL_FALLTHROUGH_INTENDED
#define FALLTHROUGH_INTENDED #define FALLTHROUGH ABSL_FALLTHROUGH_INTENDED
#else
#define FALLTHROUGH
#endif #endif
namespace java_grpc_generator { namespace java_grpc_generator {
@ -542,7 +544,7 @@ static void PrintStub(
break; break;
case BLOCKING_CLIENT_INTERFACE: case BLOCKING_CLIENT_INTERFACE:
interface = true; interface = true;
FALLTHROUGH_INTENDED; FALLTHROUGH;
case BLOCKING_CLIENT_IMPL: case BLOCKING_CLIENT_IMPL:
call_type = BLOCKING_CALL; call_type = BLOCKING_CALL;
stub_name += "BlockingStub"; stub_name += "BlockingStub";
@ -551,7 +553,7 @@ static void PrintStub(
break; break;
case FUTURE_CLIENT_INTERFACE: case FUTURE_CLIENT_INTERFACE:
interface = true; interface = true;
FALLTHROUGH_INTENDED; FALLTHROUGH;
case FUTURE_CLIENT_IMPL: case FUTURE_CLIENT_IMPL:
call_type = FUTURE_CALL; call_type = FUTURE_CALL;
stub_name += "FutureStub"; stub_name += "FutureStub";