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

Possible name clashing fix in uavcan::ReceivedDataStructure<>

Browse Source
This commit is contained in:
Pavel Kirienko
2014-08-11 13:32:52 +04:00
parent da62126ca2
commit e2e358bb06
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/node/generic_subscriber.hpp
+7 -7
View File
@@ -32,26 +32,26 @@ namespace uavcan
template <typename DataType_> template <typename DataType_>
class UAVCAN_EXPORT ReceivedDataStructure : public DataType_ class UAVCAN_EXPORT ReceivedDataStructure : public DataType_
{ {
const IncomingTransfer* transfer_; const IncomingTransfer* _transfer_; ///< Such weird name is necessary to avoid clashing with DataType fields
template <typename Ret, Ret(IncomingTransfer::*Fun) () const> template <typename Ret, Ret(IncomingTransfer::*Fun) () const>
Ret safeget() const Ret safeget() const
{ {
if (!transfer_) if (_transfer_ == NULL)
{ {
UAVCAN_ASSERT(0); UAVCAN_ASSERT(0);
return Ret(); return Ret();
} }
return (transfer_->*Fun)(); return (_transfer_->*Fun)();
} }
protected: protected:
ReceivedDataStructure() : transfer_(NULL) { } ReceivedDataStructure() : _transfer_(NULL) { }
void setTransfer(const IncomingTransfer* transfer) void setTransfer(const IncomingTransfer* arg_transfer)
{ {
UAVCAN_ASSERT(transfer); UAVCAN_ASSERT(arg_transfer != NULL);
transfer_ = transfer; _transfer_ = arg_transfer;
} }
public: public: