Skip to content

Automated Code Change #230

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

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Automated Code Change #230

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
6 changes: 3 additions & 3 deletions pybind11_protobuf/check_unknown_fields.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ bool MessageMayContainExtensionsRecursive(const ::google::protobuf::Descriptor*
bool MessageMayContainExtensionsMemoized(const ::google::protobuf::Descriptor* descriptor) {
static auto* memoized = new MayContainExtensionsMap();
static absl::Mutex lock;
absl::MutexLock l(&lock);
absl::MutexLock l(lock);
return MessageMayContainExtensionsRecursive(descriptor, memoized);
}

Expand Down Expand Up @@ -187,11 +187,11 @@ absl::optional<std::string> CheckRecursively(
const auto* root_descriptor = message->GetDescriptor();
HasUnknownFields search{py_proto_api, root_descriptor};
if (!search.FindUnknownFieldsRecursive(message, 0u)) {
return absl::nullopt;
return std::nullopt;
}
if (GetAllowList()->count(MakeAllowListKey(root_descriptor->full_name(),
search.FieldFQN())) != 0) {
return absl::nullopt;
return std::nullopt;
}
return search.BuildErrorMessage();
}
Expand Down
Loading