This is an automated email from the ASF dual-hosted git repository.
wwbmmm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brpc.git
The following commit(s) were added to refs/heads/master by this push:
new d47c39c8 fix some codes that violates the C++ One Definition Rule
[-Wodr] (#2161)
d47c39c8 is described below
commit d47c39c85b5ae2e166e16407980f761cf7b470eb
Author: lrita <[email protected]>
AuthorDate: Mon Mar 13 09:53:29 2023 +0800
fix some codes that violates the C++ One Definition Rule [-Wodr] (#2161)
---
src/brpc/policy/baidu_rpc_protocol.cpp | 2 ++
src/brpc/policy/nshead_protocol.cpp | 2 ++
src/brpc/policy/thrift_protocol.cpp | 2 ++
src/butil/popen.cpp | 2 +-
4 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/brpc/policy/baidu_rpc_protocol.cpp
b/src/brpc/policy/baidu_rpc_protocol.cpp
index 0239960e..73e42f93 100644
--- a/src/brpc/policy/baidu_rpc_protocol.cpp
+++ b/src/brpc/policy/baidu_rpc_protocol.cpp
@@ -275,6 +275,7 @@ void SendRpcResponse(int64_t correlation_id,
}
}
+namespace {
struct CallMethodInBackupThreadArgs {
::google::protobuf::Service* service;
const ::google::protobuf::MethodDescriptor* method;
@@ -283,6 +284,7 @@ struct CallMethodInBackupThreadArgs {
::google::protobuf::Message* response;
::google::protobuf::Closure* done;
};
+}
static void CallMethodInBackupThread(void* void_args) {
CallMethodInBackupThreadArgs* args =
(CallMethodInBackupThreadArgs*)void_args;
diff --git a/src/brpc/policy/nshead_protocol.cpp
b/src/brpc/policy/nshead_protocol.cpp
index b8945f97..cc27df23 100644
--- a/src/brpc/policy/nshead_protocol.cpp
+++ b/src/brpc/policy/nshead_protocol.cpp
@@ -169,6 +169,7 @@ ParseResult ParseNsheadMessage(butil::IOBuf* source,
return MakeMessage(msg);
}
+namespace {
struct CallMethodInBackupThreadArgs {
NsheadService* service;
const Server* server;
@@ -177,6 +178,7 @@ struct CallMethodInBackupThreadArgs {
NsheadMessage* response;
NsheadClosure* done;
};
+}
static void CallMethodInBackupThread(void* void_args) {
CallMethodInBackupThreadArgs* args =
(CallMethodInBackupThreadArgs*)void_args;
diff --git a/src/brpc/policy/thrift_protocol.cpp
b/src/brpc/policy/thrift_protocol.cpp
index 9871c013..82b5a789 100755
--- a/src/brpc/policy/thrift_protocol.cpp
+++ b/src/brpc/policy/thrift_protocol.cpp
@@ -414,6 +414,7 @@ inline void
ProcessThriftFramedRequestNoExcept(ThriftService* service,
done->ResumeRunning();
}
+namespace {
struct CallMethodInBackupThreadArgs {
ThriftService* service;
Controller* controller;
@@ -421,6 +422,7 @@ struct CallMethodInBackupThreadArgs {
ThriftFramedMessage* response;
ThriftClosure* done;
};
+}
static void CallMethodInBackupThread(void* void_args) {
CallMethodInBackupThreadArgs* args =
(CallMethodInBackupThreadArgs*)void_args;
diff --git a/src/butil/popen.cpp b/src/butil/popen.cpp
index e8061995..506a0d1b 100644
--- a/src/butil/popen.cpp
+++ b/src/butil/popen.cpp
@@ -29,7 +29,7 @@
#include <sys/wait.h>
extern "C" {
-uint64_t BAIDU_WEAK bthread_usleep(uint64_t microseconds);
+int BAIDU_WEAK bthread_usleep(uint64_t microseconds);
}
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
