From 6d71f1d8264b929ca71bf133246b894ed955c079 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 12 六月 2025 15:17:50 +0800
Subject: [PATCH] Merge branch 'master' into liuyang

---
 SourceCode/Bond/Servo/CBonder.h |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/CBonder.h b/SourceCode/Bond/Servo/CBonder.h
index f24e05b..28f557f 100644
--- a/SourceCode/Bond/Servo/CBonder.h
+++ b/SourceCode/Bond/Servo/CBonder.h
@@ -16,12 +16,11 @@
         virtual void term();
         virtual void initPins();
         virtual void initSteps();
+        virtual void initSlots();
         virtual void onTimer(UINT nTimerid);
         virtual void serialize(CArchive& ar);
         virtual void getAttributeVector(CAttributeVector& attrubutes);
         virtual int recvIntent(CPin* pPin, CIntent* pIntent);
-        virtual BOOL glassWillArrive(CGlass* pGlass);
-        virtual BOOL onPreStoredJob(int port, CJobDataB* pJobDataB);
         virtual int onProcessData(CProcessData* pProcessData);
         virtual int getIndexerOperationModeBaseValue();
 

--
Gitblit v1.9.3