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

ReceivedDataStructure<> made noncopyable

Browse Source
This commit is contained in:
Pavel Kirienko 2016-07-29 17:24:18 +03:00
parent 8b434c7768
commit c2ba231741
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libuavcan/include/uavcan/node/generic_subscriber.hpp
View File

@ -29,9 +29,14 @@ namespace uavcan
* void first(const ReceivedDataStructure<Foo>& msg);
* void second(const Foo& msg);
* In the latter case, an implicit cast will happen before the callback is invoked.
*
* This class is not copyable because it holds a reference to a stack-allocated transfer descriptor object.
* You can slice cast it to the underlying data type though, which would be copyable:
* DataType dt = rds; // where rds is of type ReceivedDataStructure<DataType>
* // dt is now copyable
*/
template <typename DataType_>
class UAVCAN_EXPORT ReceivedDataStructure : public DataType_
class UAVCAN_EXPORT ReceivedDataStructure : public DataType_, Noncopyable
{
const IncomingTransfer* const _transfer_; ///< Such weird name is necessary to avoid clashing with DataType fields

10
libuavcan/test/protocol/helpers.hpp
View File

@ -14,18 +14,16 @@
template <typename DataType>
class SubscriptionCollector : uavcan::Noncopyable
{
typedef uavcan::ReceivedDataStructure<DataType> ReceivedDataStructType;
void handler(const ReceivedDataStructType& msg)
void handler(const DataType& msg)
{
this->msg.reset(new ReceivedDataStructType(msg));
this->msg.reset(new DataType(msg));
}
public:
std::auto_ptr<ReceivedDataStructType> msg;
std::auto_ptr<DataType> msg;
typedef uavcan::MethodBinder<SubscriptionCollector*,
void (SubscriptionCollector::*)(const ReceivedDataStructType&)> Binder;
void (SubscriptionCollector::*)(const DataType&)> Binder;
Binder bind() { return Binder(this, &SubscriptionCollector::handler); }
};