From e2e358bb069be4d52442e590fb14a6ceb1b9d65f Mon Sep 17 00:00:00 2001
From: Pavel Kirienko <pavel.kirienko@gmail.com>
Date: Mon, 11 Aug 2014 13:32:52 +0400
Subject: [PATCH] Possible name clashing fix in uavcan::ReceivedDataStructure<>

---
 .../include/uavcan/node/generic_subscriber.hpp     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libuavcan/include/uavcan/node/generic_subscriber.hpp b/libuavcan/include/uavcan/node/generic_subscriber.hpp
index 161a8d04c8..2cb6083ddf 100644
--- a/libuavcan/include/uavcan/node/generic_subscriber.hpp
+++ b/libuavcan/include/uavcan/node/generic_subscriber.hpp
@@ -32,26 +32,26 @@ namespace uavcan
 template <typename 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>
     Ret safeget() const
     {
-        if (!transfer_)
+        if (_transfer_ == NULL)
         {
             UAVCAN_ASSERT(0);
             return Ret();
         }
-        return (transfer_->*Fun)();
+        return (_transfer_->*Fun)();
     }
 
 protected:
-    ReceivedDataStructure() : transfer_(NULL) { }
+    ReceivedDataStructure() : _transfer_(NULL) { }
 
-    void setTransfer(const IncomingTransfer* transfer)
+    void setTransfer(const IncomingTransfer* arg_transfer)
     {
-        UAVCAN_ASSERT(transfer);
-        transfer_ = transfer;
+        UAVCAN_ASSERT(arg_transfer != NULL);
+        _transfer_ = arg_transfer;
     }
 
 public: