From bf6394004c9bd324c81b6f6bcf1bbbe72240324f Mon Sep 17 00:00:00 2001 From: gerkey Date: Thu, 16 Jun 2016 08:44:12 -0700 Subject: [PATCH] Fix style (#229) --- rclcpp/src/rclcpp/executor.cpp | 3 ++- rclcpp/src/rclcpp/utilities.cpp | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rclcpp/src/rclcpp/executor.cpp b/rclcpp/src/rclcpp/executor.cpp index 732d890..b02e4a6 100644 --- a/rclcpp/src/rclcpp/executor.cpp +++ b/rclcpp/src/rclcpp/executor.cpp @@ -78,7 +78,8 @@ Executor::~Executor() "[rclcpp::error] failed to destroy guard condition: %s\n", rcl_get_error_string_safe()); } // 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_); } diff --git a/rclcpp/src/rclcpp/utilities.cpp b/rclcpp/src/rclcpp/utilities.cpp index e1ae78b..4beb601 100644 --- a/rclcpp/src/rclcpp/utilities.cpp +++ b/rclcpp/src/rclcpp/utilities.cpp @@ -201,9 +201,11 @@ rclcpp::utilities::release_sigint_guard_condition(rcl_wait_set_t * waitset) auto kv = g_sigint_guard_cond_handles.find(waitset); if (kv != g_sigint_guard_cond_handles.end()) { 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( "Failed to destroy sigint guard condition: ") + rcl_get_error_string_safe()); + // *INDENT-ON* } g_sigint_guard_cond_handles.erase(kv); } else {