Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cast to std::array #321

Merged
merged 3 commits into from
Nov 15, 2018
Merged

cast to std::array #321

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa64ac8
cast to std::array
Karsten1987 Nov 14, 2018
8cff25d
take member as a ref
Karsten1987 Nov 14, 2018
f93a540
use auto
Karsten1987 Nov 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions rosidl_typesupport_introspection_cpp/resource/msg__type_support.cpp.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
@# - get_header_filename_from_msg_name (function)
@#######################################################################
@
#include <array>
// providing offsetof()
#include <cstddef>
#include <vector>
Expand Down Expand Up @@ -46,7 +47,7 @@ size_t size_function__@(spec.base_type.type)__@(field.name)(const void * untyped
(void)untyped_member;
return @(field.type.array_size);
@[ else]@
const std::vector<@(field.type.pkg_name)::msg::@(field.type.type)> * member =
const auto * member =
reinterpret_cast<const std::vector<@(field.type.pkg_name)::msg::@(field.type.type)> *>(untyped_member);
return member->size();
@[ end if]@
Expand All @@ -55,10 +56,10 @@ size_t size_function__@(spec.base_type.type)__@(field.name)(const void * untyped
const void * get_const_function__@(spec.base_type.type)__@(field.name)(const void * untyped_member, size_t index)
{
@[ if field.type.array_size and not field.type.is_upper_bound]@
const @(field.type.pkg_name)::msg::@(field.type.type) * member =
reinterpret_cast<const @(field.type.pkg_name)::msg::@(field.type.type) *>(untyped_member);
const auto & member =
*reinterpret_cast<const std::array<@(field.type.pkg_name)::msg::@(field.type.type), @(field.type.array_size)> *>(untyped_member);
@[ else]@
const std::vector<@(field.type.pkg_name)::msg::@(field.type.type)> & member =
const auto & member =
*reinterpret_cast<const std::vector<@(field.type.pkg_name)::msg::@(field.type.type)> *>(untyped_member);
@[ end if]@
return &member[index];
Expand All @@ -67,10 +68,10 @@ const void * get_const_function__@(spec.base_type.type)__@(field.name)(const voi
void * get_function__@(spec.base_type.type)__@(field.name)(void * untyped_member, size_t index)
{
@[ if field.type.array_size and not field.type.is_upper_bound]@
@(field.type.pkg_name)::msg::@(field.type.type) * member =
reinterpret_cast<@(field.type.pkg_name)::msg::@(field.type.type) *>(untyped_member);
auto & member =
*reinterpret_cast<std::array<@(field.type.pkg_name)::msg::@(field.type.type), @(field.type.array_size)> *>(untyped_member);
@[ else]@
std::vector<@(field.type.pkg_name)::msg::@(field.type.type)> & member =
auto & member =
*reinterpret_cast<std::vector<@(field.type.pkg_name)::msg::@(field.type.type)> *>(untyped_member);
@[ end if]@
return &member[index];
Expand All @@ -79,7 +80,7 @@ void * get_function__@(spec.base_type.type)__@(field.name)(void * untyped_member
@[ if not field.type.array_size or field.type.is_upper_bound]@
void resize_function__@(spec.base_type.type)__@(field.name)(void * untyped_member, size_t size)
{
std::vector<@(field.type.pkg_name)::msg::@(field.type.type)> * member =
auto * member =
reinterpret_cast<std::vector<@(field.type.pkg_name)::msg::@(field.type.type)> *>(untyped_member);
member->resize(size);
}
Expand Down