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

dsdlc template fix

Browse Source
This commit is contained in:
Pavel Kirienko
2015-07-10 16:30:24 +03:00
parent 5ac6dc1fb8
commit 17aeaf2d0a
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/dsdl_compiler/libuavcan_dsdl_compiler/data_type_template.tmpl
+14 -9
View File
@@ -137,14 +137,14 @@ public:
* If the union is set to another type, returns null pointer.
*/
template <typename T>
const T* as() const;
const typename ::uavcan::StorageType<T>::Type* as() const;
/**
* Switches the union to the given type and returns a mutable reference to the appropriate field.
* If the previous type was different, a default constructor will be executed.
*/
template <typename T>
T& to();
typename ::uavcan::StorageType<T>::Type& to();
% endif
<!--(end)-->
@@ -305,35 +305,40 @@ ${generate_codec_calls_per_field(call_name='decode', self_parameter_type='Refere
% if union:
% for idx,a in enumerate(fields):
template <int _tmpl>
template <>
bool ${scope_prefix}::is< typename ${scope_prefix}::FieldTypes::${a.name} >() const
template <>
bool ${scope_prefix}<0>::is< typename ${scope_prefix}<0>::FieldTypes::${a.name} >() const
{
return _tag_ == ${idx};
}
% endfor
% for idx,a in enumerate(fields):
template <int _tmpl>
template <>
const T* ${scope_prefix}::as< typename ${scope_prefix}::FieldTypes::${a.name} >() const
template <>
const typename ::uavcan::StorageType< typename ${scope_prefix}<0>::FieldTypes::${a.name} >::Type*
${scope_prefix}<0>::as< typename ${scope_prefix}<0>::FieldTypes::${a.name} >() const
{
return is< typename FieldTypes::${a.name} >() ? &${a.name} : NULL;
}
% endfor
% for idx,a in enumerate(fields):
template <int _tmpl>
template <>
T& ${scope_prefix}::to< ${scope_prefix}::FieldTypes::${a.name} >()
template <>
typename ::uavcan::StorageType< typename ${scope_prefix}<0>::FieldTypes::${a.name} >::Type&
${scope_prefix}<0>::to< ${scope_prefix}<0>::FieldTypes::${a.name} >()
{
if (_tag_ != ${idx})
{
_tag_ = ${idx};
${a.name} = FieldTypes::${a.name}();
${a.name} = ::uavcan::StorageType< typename FieldTypes::${a.name} >::Type();
}
return ${a.name};
}
% endfor
% endif
<!--(end)-->