Skip to content

Commit 9cff784

Browse files
authored
Merge pull request #56 from jonbinney/debug-ros2-ci
Fix compiler warnings and test failures on CI
2 parents 52f1728 + dff6aab commit 9cff784

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

include/filters/filter_chain.hpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,21 @@ load_chain_config(
7979
name_desc.name = norm_param_prefix + filter_n + ".name";
8080
name_desc.type = rcl_interfaces::msg::ParameterType::PARAMETER_STRING;
8181
name_desc.read_only = false;
82+
// Must be dynamically typed because later we undeclare it and redeclare
83+
// it read-only, but statically typed params cannot be undeclared.
84+
name_desc.dynamic_typing = true;
8285
rcl_interfaces::msg::ParameterDescriptor type_desc;
8386
type_desc.name = norm_param_prefix + filter_n + ".type";
8487
type_desc.type = rcl_interfaces::msg::ParameterType::PARAMETER_STRING;
8588
type_desc.read_only = false;
89+
// Must be dynamically typed because later we undeclare it and redeclare
90+
// it read-only, but statically typed params cannot be undeclared.
91+
type_desc.dynamic_typing = true;
8692

87-
node_params->declare_parameter(name_desc.name);
88-
node_params->declare_parameter(type_desc.name);
93+
node_params->declare_parameter(
94+
name_desc.name, rclcpp::ParameterValue(), name_desc);
95+
node_params->declare_parameter(
96+
type_desc.name, rclcpp::ParameterValue(), type_desc);
8997

9098
rclcpp::Parameter param_name;
9199
rclcpp::Parameter param_type;

include/filters/transfer_function.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ bool MultiChannelTransferFunctionFilter<T>::update(
311311
if (data_in.size() != this->number_of_channels_ || data_out.size() != this->number_of_channels_) {
312312
RCLCPP_ERROR(
313313
this->logging_interface_->get_logger(),
314-
"Number of channels is %d, but data_in.size() = %ld and data_out.size() = %ld. "
314+
"Number of channels is %zu, but data_in.size() = %zu and data_out.size() = %zu. "
315315
"They must match", this->number_of_channels_, data_in.size(), data_out.size());
316316
return false;
317317
}

0 commit comments

Comments
 (0)