From adf46e4da2f53d171cc5a0e95340d751ebacf763 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 26 六月 2025 14:25:31 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/BondEq/AlarmMonitor.cpp | 24 ++----------------------
1 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/SourceCode/Bond/BondEq/AlarmMonitor.cpp b/SourceCode/Bond/BondEq/AlarmMonitor.cpp
index 37528f3..de5d6e7 100644
--- a/SourceCode/Bond/BondEq/AlarmMonitor.cpp
+++ b/SourceCode/Bond/BondEq/AlarmMonitor.cpp
@@ -161,29 +161,9 @@
void CAlarmMonitor::Serialize(CArchive& ar)
{
- if (ar.IsStoring())
- {
- Lock();
- int count = (int)m_mapAlarming.size();
- ar << count;
- for (auto item : m_mapAlarming) {
- item.second->Serialize(ar);
- }
- Unlock();
+ if (ar.IsStoring()) {
}
- else
- {
- Lock();
- int count;
- ar >> count;
- for (int i = 0; i < count; i++) {
- CAlarm* pAlarm = new CAlarm();
- pAlarm->addRef();
- pAlarm->Serialize(ar);
- addAlarming(pAlarm);
- pAlarm->release();
- }
- Unlock();
+ else {
}
}
--
Gitblit v1.9.3