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/shm_msg_queue.cpp | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/src/shm_msg_queue.cpp b/src/shm_msg_queue.cpp
index 9db4c6b..e6aceb9 100644
--- a/src/shm_msg_queue.cpp
+++ b/src/shm_msg_queue.cpp
@@ -31,25 +31,13 @@
} // namespace
-ShmMsgQueue::ShmMsgQueue(ShmType &segment, const MQId id, const int len) :
+ShmMsgQueue::ShmMsgQueue(ShmType &segment, const MQId id, Mode mode) :
id_(id),
- queue_(segment, MsgQIdToName(id_), len, segment.get_segment_manager())
+ queue_(segment, MsgQIdToName(id_), mode)
{
-}
-
-ShmMsgQueue::ShmMsgQueue(ShmType &segment, const bool create_or_else_find, const MQId id, const int len) :
- id_(id),
- queue_(segment, create_or_else_find, MsgQIdToName(id_), len, segment.get_segment_manager())
-{
- if (!queue_.IsOk()) {
- throw("error create/find msgq " + std::to_string(id_));
- }
}
ShmMsgQueue::ShmMsgQueue(const int64_t abs_addr, ShmType &segment, const MQId id) :
- id_(id), queue_(abs_addr, segment, MsgQIdToName(id_))
-{
- //TODO check some tag.
-}
+ id_(id), queue_(abs_addr, segment, MsgQIdToName(id_)) {}
ShmMsgQueue::~ShmMsgQueue() {}
@@ -77,7 +65,6 @@
bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQInfo &remote, const RawData val)
{
try {
- //TODO find from center, or use offset.
ShmMsgQueue dest(remote.offset_, shm, remote.id_);
return dest.queue().TryWrite(val);
} catch (...) {
--
Gitblit v1.8.0