diff --git a/generate_parameter_library_py/generate_parameter_library_py/cpp_conversions.py b/generate_parameter_library_py/generate_parameter_library_py/cpp_conversions.py index ba410a8..bb846c4 100644 --- a/generate_parameter_library_py/generate_parameter_library_py/cpp_conversions.py +++ b/generate_parameter_library_py/generate_parameter_library_py/cpp_conversions.py @@ -49,9 +49,9 @@ def __init__(self): 'double_array': lambda defined_type, templates: 'std::vector', 'int_array': lambda defined_type, templates: 'std::vector', 'string_array': lambda defined_type, templates: 'std::vector', - 'double_array_fixed': lambda defined_type, templates: f'rsl::StaticVector<{templates[0]}, {templates[1]}>', - 'int_array_fixed': lambda defined_type, templates: f'rsl::StaticVector<{templates[0]}, {templates[1]}>', - 'string_array_fixed': lambda defined_type, templates: f'rsl::StaticVector<{templates[0]}, {templates[1]}>', + 'double_array_fixed': lambda defined_type, templates: f'std::array<{templates[0]}, {templates[1]}>', + 'int_array_fixed': lambda defined_type, templates: f'std::array<{templates[0]}, {templates[1]}>', + 'string_array_fixed': lambda defined_type, templates: f'std::array<{templates[0]}, {templates[1]}>', 'string_fixed': lambda defined_type, templates: f'rsl::StaticString<{templates[1]}>', } self.yaml_type_to_as_function = { diff --git a/generate_parameter_library_py/generate_parameter_library_py/jinja_templates/cpp/parameter_library_header b/generate_parameter_library_py/generate_parameter_library_py/jinja_templates/cpp/parameter_library_header index 4930c7a..4393f06 100644 --- a/generate_parameter_library_py/generate_parameter_library_py/jinja_templates/cpp/parameter_library_header +++ b/generate_parameter_library_py/generate_parameter_library_py/jinja_templates/cpp/parameter_library_header @@ -22,7 +22,6 @@ #include #include -#include #include {% if user_validation_file|length -%} @@ -60,8 +59,8 @@ template } template -[[nodiscard]] auto to_parameter_value(rsl::StaticVector const& value) { - return rclcpp::ParameterValue(rsl::to_vector(value)); +[[nodiscard]] auto to_parameter_value(std::array const& value) { + return rclcpp::ParameterValue(std::vector{value.begin(), value.end()}); } {%- filter indent(width=4) %}