From 4e5df2e71445ca3c0cc412e24510234e671b6072 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 19 六月 2025 16:18:33 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CGlass.cpp | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.cpp b/SourceCode/Bond/Servo/CGlass.cpp
index dc47c5e..a88255a 100644
--- a/SourceCode/Bond/Servo/CGlass.cpp
+++ b/SourceCode/Bond/Servo/CGlass.cpp
@@ -108,8 +108,6 @@
m_pPath->serialize(ar);
}
char temp[JOBDATAS_SIZE] = { 0 };
- m_jobDataB.serialize(temp, JOBDATAB_SIZE);
- ar.Write(temp, JOBDATAB_SIZE);
m_jobDataS.serialize(temp, JOBDATAS_SIZE);
ar.Write(temp, JOBDATAS_SIZE);
ar << (ULONGLONG)m_pBuddy;
@@ -131,8 +129,6 @@
m_pPath->serialize(ar);
}
char temp[JOBDATAS_SIZE];
- ar.Read(temp, JOBDATAB_SIZE);
- m_jobDataB.unserialize(temp, JOBDATAB_SIZE);
ar.Read(temp, JOBDATAS_SIZE);
m_jobDataS.unserialize(temp, JOBDATAS_SIZE);
ar >> ullPath; m_pBuddy = (CGlass*)ullPath;
@@ -141,21 +137,16 @@
}
}
- void CGlass::setJobDataB(CJobDataB* pJobDataB)
- {
- m_jobDataB.copy(pJobDataB);
- }
-
- CJobDataB* CGlass::getJobDataB()
- {
- return &m_jobDataB;
- }
-
void CGlass::setJobDataS(CJobDataS* pJobDataS)
{
m_jobDataS.copy(pJobDataS);
}
+ void CGlass::updateJobDataS(CJobDataS* pJobDataS)
+ {
+ m_jobDataS.update(pJobDataS);
+ }
+
CJobDataS* CGlass::getJobDataS()
{
return &m_jobDataS;
--
Gitblit v1.9.3