From 479e851f0a6594786b1cae66059971c469f0fb30 Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Sun, 2 Feb 2014 23:00:30 +0400 Subject: [PATCH] RxFrame inherits Frame --- libuavcan/include/uavcan/internal/transport/transfer.hpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libuavcan/include/uavcan/internal/transport/transfer.hpp b/libuavcan/include/uavcan/internal/transport/transfer.hpp index 509ecb1659..a2908a5fdd 100644 --- a/libuavcan/include/uavcan/internal/transport/transfer.hpp +++ b/libuavcan/include/uavcan/internal/transport/transfer.hpp @@ -124,10 +124,9 @@ struct Frame }; -struct RxFrame +struct RxFrame : public Frame { uint_fast64_t timestamp; - Frame frame; uint_fast8_t iface_index; RxFrame() @@ -137,7 +136,7 @@ struct RxFrame bool parse(const CanRxFrame& can_frame) { - if (!frame.parse(can_frame)) + if (!Frame::parse(can_frame)) return false; timestamp = can_frame.timestamp; iface_index = can_frame.iface_index;