From c3d188e6c595dcf1f11e105757521e405dcb648b Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 23 六月 2025 11:46:12 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CAttributeVector.cpp | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CAttributeVector.cpp b/SourceCode/Bond/Servo/CAttributeVector.cpp
index 733c629..d7c52b7 100644
--- a/SourceCode/Bond/Servo/CAttributeVector.cpp
+++ b/SourceCode/Bond/Servo/CAttributeVector.cpp
@@ -17,11 +17,20 @@
m_attributes.clear();
}
- void CAttributeVector::addAttribute(CAttribute* pAttribute, BOOL bReplace/* = FALSE*/)
+ BOOL CAttributeVector::addAttribute(CAttribute* pAttribute, BOOL bReplace/* = FALSE*/)
{
+ if (!pAttribute) {
+ return FALSE;
+ }
+
+ const std::string& name = pAttribute->getName();
+ if (name.empty()) {
+ return FALSE;
+ }
+
if (bReplace) {
for (auto it = m_attributes.begin(); it != m_attributes.end(); ) {
- if ((*it)->getName().compare(pAttribute->getName()) == 0) {
+ if (name.compare((*it)->getName()) == 0) {
delete (*it);
it = m_attributes.erase(it);
}
@@ -32,6 +41,7 @@
}
m_attributes.push_back(pAttribute);
+ return TRUE;
}
void CAttributeVector::addAttributeVector(CAttributeVector& av)
@@ -71,4 +81,9 @@
ASSERT(index < m_attributes.size());
return m_attributes[index];
}
+
+ std::vector<CAttribute*>& CAttributeVector::getAttributes()
+ {
+ return m_attributes;
+ }
}
--
Gitblit v1.9.3