fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-05 02:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed DSDL template to prevent name clashing with user defined types

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-22 10:01:02 +04:00
parent 5f434fe072
commit 314e117f7e
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/dsdl_compiler/data_type_template.tmpl
+9 -9
View File
@@ -45,13 +45,13 @@ UAVCAN_PACKED_BEGIN
#endif #endif
% if t.kind != t.KIND_SERVICE: % if t.kind != t.KIND_SERVICE:
template <int I> template <int _tmpl>
% endif % endif
struct ${t.cpp_type_name} struct ${t.cpp_type_name}
{ {
<%def name="generate_primary_body(type_name, max_bitlen, fields, constants)" buffered="True"> <%def name="generate_primary_body(type_name, max_bitlen, fields, constants)" buffered="True">
typedef const ${type_name}<I>& ParameterType; typedef const ${type_name}<_tmpl>& ParameterType;
typedef ${type_name}<I>& ReferenceType; typedef ${type_name}<_tmpl>& ReferenceType;
<%def name="expand_attr_types(group_name, attrs)"> <%def name="expand_attr_types(group_name, attrs)">
struct ${group_name} struct ${group_name}
@@ -101,7 +101,7 @@ struct ${t.cpp_type_name}
enum { MaxByteLen = ::uavcan::BitLenToByteLen<MaxBitLen>::Result }; enum { MaxByteLen = ::uavcan::BitLenToByteLen<MaxBitLen>::Result };
::uavcan::StaticAssert<int(MaxByteLen) <= int(::uavcan::MaxTransferPayloadLen)>::check(); ::uavcan::StaticAssert<int(MaxByteLen) <= int(::uavcan::MaxTransferPayloadLen)>::check();
::uavcan::StaticAssert<I == 0>::check(); // Usage check ::uavcan::StaticAssert<_tmpl == 0>::check(); // Usage check
#if UAVCAN_DEBUG #if UAVCAN_DEBUG
/* /*
@@ -148,13 +148,13 @@ ${'::uavcan::TailArrayOptDisabled' if (idx + 1) < len(fields) else 'tao_mode'});
${generate_codec_calls_per_field('decode', 'ReferenceType')} ${generate_codec_calls_per_field('decode', 'ReferenceType')}
</%def> </%def>
% if t.kind == t.KIND_SERVICE: % if t.kind == t.KIND_SERVICE:
template <int I> template <int _tmpl>
struct Request_ struct Request_
{ {
${generate_primary_body('Request_', t.get_max_bitlen_request(), t.request_fields, t.request_constants) | indent} ${generate_primary_body('Request_', t.get_max_bitlen_request(), t.request_fields, t.request_constants) | indent}
}; };
template <int I> template <int _tmpl>
struct Response_ struct Response_
{ {
${generate_primary_body('Response_', t.get_max_bitlen_response(), t.response_fields, t.response_constants) | indent} ${generate_primary_body('Response_', t.get_max_bitlen_response(), t.response_fields, t.response_constants) | indent}
@@ -212,9 +212,9 @@ private:
<%def name="define_out_of_line_constants(scope_prefix, constants)"> <%def name="define_out_of_line_constants(scope_prefix, constants)">
% for a in constants: % for a in constants:
% if not a.cpp_use_enum: % if not a.cpp_use_enum:
template <int I> template <int _tmpl>
const typename ::uavcan::StorageType< typename ${scope_prefix}<I>::ConstantTypes::${a.name} >::Type const typename ::uavcan::StorageType< typename ${scope_prefix}<_tmpl>::ConstantTypes::${a.name} >::Type
${scope_prefix}<I>::${a.name} = ${a.cpp_value}; // ${a.init_expression} ${scope_prefix}<_tmpl>::${a.name} = ${a.cpp_value}; // ${a.init_expression}
%endif %endif
% endfor % endfor
libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp
-1
View File
@@ -15,7 +15,6 @@
#include <uavcan/protocol/DataTypeKind.hpp> #include <uavcan/protocol/DataTypeKind.hpp>
#include <uavcan/protocol/GlobalDiscoveryRequest.hpp> #include <uavcan/protocol/GlobalDiscoveryRequest.hpp>
#include <uavcan/protocol/GetDataTypeInfo.hpp> #include <uavcan/protocol/GetDataTypeInfo.hpp>
#include <uavcan/protocol/Version.hpp>
#include <uavcan/protocol/NodeStatus.hpp> #include <uavcan/protocol/NodeStatus.hpp>
#include <uavcan/protocol/GetNodeInfo.hpp> #include <uavcan/protocol/GetNodeInfo.hpp>
#include <uavcan/protocol/debug/LogMessage.hpp> #include <uavcan/protocol/debug/LogMessage.hpp>