fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-21 17:33:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

name --> full_name

Browse Source
This commit is contained in:
Pavel Kirienko
2014-02-28 14:26:13 +04:00
parent 1c1e1b1fb9
commit 2e79b92aee
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/src/data_type.cpp
+3 -3
View File
@@ -41,7 +41,7 @@ TransferCRC DataTypeSignature::toTransferCRC() const
*/
bool DataTypeDescriptor::match(DataTypeKind kind, const char* name) const
{
return (kind_ == kind) && !std::strcmp(name_, name);
return (kind_ == kind) && !std::strcmp(full_name_, name);
}
bool DataTypeDescriptor::match(DataTypeKind kind, uint16_t id) const
@@ -60,7 +60,7 @@ std::string DataTypeDescriptor::toString() const
}
std::ostringstream os;
os << name_ << ":" << id_ << kindch << ":" << std::hex << std::setfill('0') << std::setw(16) << signature_.get();
os << full_name_ << ":" << id_ << kindch << ":" << std::hex << std::setfill('0') << std::setw(16) << signature_.get();
return os.str();
}
@@ -70,7 +70,7 @@ bool DataTypeDescriptor::operator==(const DataTypeDescriptor& rhs) const
(kind_ == rhs.kind_) &&
(id_ == rhs.id_) &&
(signature_ == rhs.signature_) &&
!std::strcmp(name_, rhs.name_);
!std::strcmp(full_name_, rhs.full_name_);
}
}
libuavcan/src/global_data_type_registry.cpp
+2 -2
View File
@@ -52,7 +52,7 @@ GlobalDataTypeRegistry::RegistResult GlobalDataTypeRegistry::remove(Entry* dtd)
while (p)
{
Entry* const next = p->getNextListNode();
if (p->descriptor.match(dtd->descriptor.getKind(), dtd->descriptor.getName()))
if (p->descriptor.match(dtd->descriptor.getKind(), dtd->descriptor.getFullName()))
list->remove(p);
p = next;
}
@@ -79,7 +79,7 @@ GlobalDataTypeRegistry::RegistResult GlobalDataTypeRegistry::registImpl(Entry* d
{
if (p->descriptor.getID() == dtd->descriptor.getID()) // ID collision
return RegistResultCollision;
if (p->descriptor.match(dtd->descriptor.getName())) // Name collision
if (p->descriptor.match(dtd->descriptor.getFullName())) // Name collision
return RegistResultCollision;
p = p->getNextListNode();
}