From 1c080b5ca821ef6e1d40025289195b18fa2973b5 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 26 一月 2026 22:46:48 +0800
Subject: [PATCH] 1.把 m_bufGlass 的释放提前到 CMaster::term()，确保在 m_glassPool.term() 之前完成，避免析构时再触碰已被回收的 Glass。析构里仍保留原逻辑，若 term() 已清空则不会重复释放。
---
SourceCode/Bond/Servo/CEqJobEventStep.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqJobEventStep.h b/SourceCode/Bond/Servo/CEqJobEventStep.h
index 380470f..c0cbace 100644
--- a/SourceCode/Bond/Servo/CEqJobEventStep.h
+++ b/SourceCode/Bond/Servo/CEqJobEventStep.h
@@ -1,6 +1,6 @@
#pragma once
#include "CReadStep.h"
-#include "CJobDataA.h"
+#include "CJobDataS.h"
namespace SERVO {
@@ -8,7 +8,7 @@
{
public:
CEqJobEventStep();
- ~CEqJobEventStep();
+ virtual ~CEqJobEventStep();
public:
virtual void getAttributeVector(CAttributeVector& attrubutes);
@@ -16,11 +16,11 @@
virtual int onComplete();
virtual int onTimeout();
void setJobDataDev(int nDev);
- CJobDataA* getJobDataA();
+ CJobDataS* getJobDataS();
private:
int m_nJobDataADev;
- CJobDataA m_jobDataA;
+ CJobDataS m_jobDataS;
};
}
--
Gitblit v1.9.3