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

Update to handle rename of java_names.h to names.h in protobuf upstream (#9218)

This commit is contained in:
Jeremy Volkman 2022-05-31 15:08:10 -07:00 committed by GitHub
parent 0490ced91c
commit 84edc33239
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,11 +22,18 @@
#include <map>
#include <set>
#include <vector>
#include <google/protobuf/compiler/java/java_names.h>
#include <google/protobuf/descriptor.h>
#include <google/protobuf/descriptor.pb.h>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/io/zero_copy_stream.h>
#include <google/protobuf/stubs/common.h>
// Protobuf 3.21 changed the name of this file.
#if GOOGLE_PROTOBUF_VERSION >= 3021000
#include <google/protobuf/compiler/java/names.h>
#else
#include <google/protobuf/compiler/java/java_names.h>
#endif
// Stringify helpers used solely to cast GRPC_VERSION
#ifndef STR