niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix style (#229)

Browse source
This commit is contained in:
gerkey 2016-06-16 08:44:12 -07:00 • committed by GitHub
parent 39f0a1b93f
commit bf6394004c
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rclcpp/src/rclcpp/executor.cpp
View file

@ -78,7 +78,8 @@ Executor::~Executor()
"[rclcpp::error] failed to destroy guard condition: %s\n", rcl_get_error_string_safe()); "[rclcpp::error] failed to destroy guard condition: %s\n", rcl_get_error_string_safe());
} }
// Remove and release the sigint guard condition // Remove and release the sigint guard condition
memory_strategy_->remove_guard_condition(rclcpp::utilities::get_sigint_guard_condition(&waitset_)); memory_strategy_->remove_guard_condition(
rclcpp::utilities::get_sigint_guard_condition(&waitset_));
rclcpp::utilities::release_sigint_guard_condition(&waitset_); rclcpp::utilities::release_sigint_guard_condition(&waitset_);
} }

2
rclcpp/src/rclcpp/utilities.cpp
View file

@ -201,9 +201,11 @@ rclcpp::utilities::release_sigint_guard_condition(rcl_wait_set_t * waitset)
auto kv = g_sigint_guard_cond_handles.find(waitset); auto kv = g_sigint_guard_cond_handles.find(waitset);
if (kv != g_sigint_guard_cond_handles.end()) { if (kv != g_sigint_guard_cond_handles.end()) {
if (rcl_guard_condition_fini(&kv->second) != RCL_RET_OK) { if (rcl_guard_condition_fini(&kv->second) != RCL_RET_OK) {
// *INDENT-OFF* (prevent uncrustify from making unnecessary indents here)
throw std::runtime_error(std::string( throw std::runtime_error(std::string(
"Failed to destroy sigint guard condition: ") + "Failed to destroy sigint guard condition: ") +
rcl_get_error_string_safe()); rcl_get_error_string_safe());
// *INDENT-ON*
} }
g_sigint_guard_cond_handles.erase(kv); g_sigint_guard_cond_handles.erase(kv);
} else { } else {