From 4d136040f933584d4e0663751ad440f8a56e06ee Mon Sep 17 00:00:00 2001 From: Pedro Pena Date: Fri, 17 Jul 2020 15:21:20 -0400 Subject: [PATCH] remove line break and add static executor in cmakelist --- rclcpp/CMakeLists.txt | 4 ++-- rclcpp/include/rclcpp/callback_group.hpp | 3 +-- rclcpp/include/rclcpp/node.hpp | 3 +-- rclcpp/include/rclcpp/node_interfaces/node_base_interface.hpp | 3 +-- rclcpp/src/rclcpp/node.cpp | 3 +-- rclcpp/src/rclcpp/node_interfaces/node_base.cpp | 3 +-- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/rclcpp/CMakeLists.txt b/rclcpp/CMakeLists.txt index 00572fd1f8..24d0a1d930 100644 --- a/rclcpp/CMakeLists.txt +++ b/rclcpp/CMakeLists.txt @@ -52,8 +52,8 @@ set(${PROJECT_NAME}_SRCS src/rclcpp/expand_topic_or_service_name.cpp src/rclcpp/executors/multi_threaded_executor.cpp src/rclcpp/executors/single_threaded_executor.cpp -# src/rclcpp/executors/static_executor_entities_collector.cpp -# src/rclcpp/executors/static_single_threaded_executor.cpp + src/rclcpp/executors/static_executor_entities_collector.cpp + src/rclcpp/executors/static_single_threaded_executor.cpp src/rclcpp/future_return_code.cpp src/rclcpp/graph_listener.cpp src/rclcpp/guard_condition.cpp diff --git a/rclcpp/include/rclcpp/callback_group.hpp b/rclcpp/include/rclcpp/callback_group.hpp index 7681c704c7..f51ec00ab5 100644 --- a/rclcpp/include/rclcpp/callback_group.hpp +++ b/rclcpp/include/rclcpp/callback_group.hpp @@ -57,8 +57,7 @@ class CallbackGroup RCLCPP_SMART_PTR_DEFINITIONS(CallbackGroup) RCLCPP_PUBLIC - explicit CallbackGroup( - CallbackGroupType group_type); + explicit CallbackGroup(CallbackGroupType group_type); template rclcpp::SubscriptionBase::SharedPtr diff --git a/rclcpp/include/rclcpp/node.hpp b/rclcpp/include/rclcpp/node.hpp index 9e9cfe4c47..1af20e0f33 100644 --- a/rclcpp/include/rclcpp/node.hpp +++ b/rclcpp/include/rclcpp/node.hpp @@ -139,8 +139,7 @@ class Node : public std::enable_shared_from_this /// Create and return a callback group. RCLCPP_PUBLIC rclcpp::CallbackGroup::SharedPtr - create_callback_group( - rclcpp::CallbackGroupType group_type); + create_callback_group(rclcpp::CallbackGroupType group_type); /// Return the list of callback groups in the node. RCLCPP_PUBLIC diff --git a/rclcpp/include/rclcpp/node_interfaces/node_base_interface.hpp b/rclcpp/include/rclcpp/node_interfaces/node_base_interface.hpp index 693ce09540..bcb469c0bf 100644 --- a/rclcpp/include/rclcpp/node_interfaces/node_base_interface.hpp +++ b/rclcpp/include/rclcpp/node_interfaces/node_base_interface.hpp @@ -106,8 +106,7 @@ class NodeBaseInterface RCLCPP_PUBLIC virtual rclcpp::CallbackGroup::SharedPtr - create_callback_group( - rclcpp::CallbackGroupType group_type) = 0; + create_callback_group(rclcpp::CallbackGroupType group_type) = 0; /// Return the default callback group. RCLCPP_PUBLIC diff --git a/rclcpp/src/rclcpp/node.cpp b/rclcpp/src/rclcpp/node.cpp index 56edf0145d..b69d7c2baf 100644 --- a/rclcpp/src/rclcpp/node.cpp +++ b/rclcpp/src/rclcpp/node.cpp @@ -211,8 +211,7 @@ Node::get_logger() const } rclcpp::CallbackGroup::SharedPtr -Node::create_callback_group( - rclcpp::CallbackGroupType group_type) +Node::create_callback_group(rclcpp::CallbackGroupType group_type) { return node_base_->create_callback_group(group_type); } diff --git a/rclcpp/src/rclcpp/node_interfaces/node_base.cpp b/rclcpp/src/rclcpp/node_interfaces/node_base.cpp index a56cd84ffc..d8c13bd826 100644 --- a/rclcpp/src/rclcpp/node_interfaces/node_base.cpp +++ b/rclcpp/src/rclcpp/node_interfaces/node_base.cpp @@ -216,8 +216,7 @@ NodeBase::get_shared_rcl_node_handle() const } rclcpp::CallbackGroup::SharedPtr -NodeBase::create_callback_group( - rclcpp::CallbackGroupType group_type) +NodeBase::create_callback_group(rclcpp::CallbackGroupType group_type) { using rclcpp::CallbackGroup; using rclcpp::CallbackGroupType;