Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
May 31, 2022
Merged

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a839fbd
java_names.h -> names.h
jvolkman May 26, 2022
bc05c9a
Update build.gradle
jvolkman May 27, 2022
77e663e
Switch java_names.h/names.h based on GOOGLE_PROTOBUF_VERSION
jvolkman May 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion compiler/src/java_plugin/cpp/java_generator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down