Skip to content

Internal change. #23788

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

Closed
wants to merge 1 commit into from
Closed

Internal change. #23788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/google/protobuf/compiler/java/names.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ std::string FileJavaPackage(const FileDescriptor* file, bool immutable,
}

std::string FileJavaPackage(const FileDescriptor* file) {
return Proto2DefaultJavaPackage(file);
return Proto2DefaultJavaPackage(*file);
}

std::string JavaPackageDirectory(const FileDescriptor* file) {
Expand Down
10 changes: 5 additions & 5 deletions src/google/protobuf/compiler/java/names_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@ inline std::string JoinPackage(absl::string_view a, absl::string_view b) {
}
}

inline std::string DefaultJavaPackage(const FileDescriptor* file) {
if (file->options().has_java_package()) {
return file->options().java_package();
inline std::string DefaultJavaPackage(const FileDescriptor& file) {
if (file.options().has_java_package()) {
return file.options().java_package();
} else {
return JoinPackage(google::protobuf::internal::IsOss() ? "" : "com.google.protos",
file->package());
file.package());
}
}

// The package name to use for a file that is being compiled as proto2-API.
// If the file is declared as proto1-API, this may involve using the alternate
// package name.
inline std::string Proto2DefaultJavaPackage(const FileDescriptor* file) {
inline std::string Proto2DefaultJavaPackage(const FileDescriptor& file) {

return DefaultJavaPackage(file);
}
Expand Down
Loading