合并代码

LAPTOP-T815PCOQ\25526

2024-11-25 6d106eb1bb92dc235bcbda976ae232729bf52c7c

 SourceCode/Bond/BondEq/CBonder.h

@@ -20,7 +20,6 @@

typedef std::function<void(void* pFrom, int)> ONBONDSTATECHANGED;
typedef std::function<void(void* pFrom, int)> ONPLCSTATECHANGED;
typedef std::function<void(void* pFrom, int)> ONCIMSTATECHANGED;
typedef std::function<void(void* pFrom, const char* pszAddr, int port, int)> ONEFEMSTATECHANGED;
typedef std::function<void(void* pFrom, void*)> ONRECVBROADCAST;

@@ -28,7 +27,6 @@
{
   ONBONDSTATECHANGED      onStateChanged;
   ONPLCSTATECHANGED      onPlcStateChanged;
   ONCIMSTATECHANGED      onCimStateChanged;
   ONEFEMSTATECHANGED      onEfemStateChanged;
   ONRECVBROADCAST         onRecvBroadcast;
} BondListener;
@@ -44,6 +42,7 @@
   void setListener(BondListener& listener);
   void setWorkDir(const char* pszWorkDir);
   const std::vector<CComponent*>& getComponents();
   CPLC* getPLC(const char* pszName);
   int init();
   int term();
   void sendBroadcast(CComponent* pSender, CIntent* pIntent);