From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CPin.cpp | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPin.cpp b/SourceCode/Bond/Servo/CPin.cpp
index 391e250..832e74a 100644
--- a/SourceCode/Bond/Servo/CPin.cpp
+++ b/SourceCode/Bond/Servo/CPin.cpp
@@ -53,7 +53,7 @@
// 返回 >= 0连接成功
int CPin::accpetConnect(CPin* pPin)
{
- assert(pPin);
+ ASSERT(pPin);
// 是否已经连接
@@ -73,7 +73,7 @@
int CPin::connectPin(CPin* pPin)
{
- assert(pPin);
+ ASSERT(pPin);
// 是否已经连接
@@ -105,7 +105,7 @@
return -1;
}
- assert(m_pConnectedPin->m_pConnectedPin == this);
+ ASSERT(m_pConnectedPin->m_pConnectedPin == this);
m_pConnectedPin->m_pConnectedPin = NULL;
m_pConnectedPin = NULL;
@@ -115,7 +115,7 @@
int CPin::sendIntent(CIntent* pIntent)
{
if (m_pConnectedPin != NULL) {
- m_pConnectedPin->recvIntent(pIntent);
+ return m_pConnectedPin->recvIntent(pIntent);
}
return 0;
@@ -123,8 +123,7 @@
int CPin::recvIntent(CIntent* pIntent)
{
- assert(m_pEquipment);
- m_pEquipment->recvIntent(this, pIntent);
- return 0;
+ ASSERT(m_pEquipment);
+ return m_pEquipment->recvIntent(this, pIntent);
}
}
--
Gitblit v1.9.3