From 056f71f24cefaf88f2a93714c6678c03ed5f1e0e Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 02 七月 2021 16:54:33 +0800
Subject: [PATCH] fixed to adapt gcc-5.4 & glibc-2.25
---
src/msg.cpp | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/msg.cpp b/src/msg.cpp
index dca2044..3546424 100644
--- a/src/msg.cpp
+++ b/src/msg.cpp
@@ -23,13 +23,6 @@
namespace bhome_msg
{
-ShmSocket &ShmMsg::Sender()
-{
- static auto &mq = GetCenterInfo(shm())->mq_sender_;
- static ShmSocket sender(mq.offset_, shm(), mq.id_);
- return sender;
-}
-
int ShmMsg::Release()
{
if (!valid()) {
@@ -39,12 +32,13 @@
if (n == 0) {
if (meta()->managed_) {
int64_t free_cmd = (id() << 4) | EncodeCmd(eCmdFree);
- Sender().Send(BHTopicCenterAddress(), free_cmd);
+ DefaultSender(shm()).Send(BHTopicCenterAddress(shm()), free_cmd);
} else {
Free();
}
} else if (n < 0) {
- LOG_FATAL() << "error double release data.";
+ // ns_log::GetTrace();
+ LOG_FATAL() << "double release msg.";
throw std::runtime_error("double release msg.");
}
return n;
--
Gitblit v1.8.0