Skip to content

Fix protobuf compilation errors #3293

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

Merged
wwbmmm merged 1 commit into from
May 12, 2026
+5 −9
Merged

Fix protobuf compilation errors #3293

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 BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ cc_library(
deps = [
":brpc_idl_options_cc_proto",
":butil",
"@com_google_protobuf//src/google/protobuf/compiler:code_generator",
"@com_google_protobuf//:protoc_lib",
],
)

Expand Down
2 changes: 1 addition & 1 deletion src/brpc/nonreflectable_message.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class NonreflectableMessage : public ::google::protobuf::Message {
void DiscardUnknownFields() override {}
#endif

#if GOOGLE_PROTOBUF_VERSION < 5026000
#if GOOGLE_PROTOBUF_VERSION >= 3004000 && GOOGLE_PROTOBUF_VERSION < 5026000
// Unsupported by default.
size_t SpaceUsedLong() const override {
return 0;
Expand Down
10 changes: 3 additions & 7 deletions test/brpc_channel_unittest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,14 +298,10 @@ class ChannelTest : public ::testing::Test{
cntl->_current_call.sending_sock.reset(ptr.release());
cntl->_server = &ts->_dummy;

google::protobuf::Closure* done =
brpc::NewCallback<
int64_t, brpc::Controller*,
brpc::RpcPBMessages*,
const brpc::Server*,
google::protobuf::Closure* done = brpc::NewCallback<
int64_t, brpc::Controller*, brpc::RpcPBMessages*, const brpc::Server*,
brpc::MethodStatus*, int64_t, std::shared_ptr<brpc::Span>>(
&brpc::policy::SendRpcResponse,
meta.correlation_id(), cntl,
&brpc::policy::SendRpcResponse, meta.correlation_id(), cntl,
messages, &ts->_dummy, NULL, -1, nullptr);
ts->_svc.CallMethod(method, cntl, req, res, done);
}
Expand Down
Loading