From bfa5f2cdcbb8209aca8e24d3d5b0357403cb47f6 Mon Sep 17 00:00:00 2001 From: Jackie Kay Date: Mon, 30 Nov 2015 13:20:59 -0800 Subject: [PATCH 1/2] Move scope_exit --- rclcpp/{src => include}/rclcpp/scope_exit.hpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rclcpp/{src => include}/rclcpp/scope_exit.hpp (100%) diff --git a/rclcpp/src/rclcpp/scope_exit.hpp b/rclcpp/include/rclcpp/scope_exit.hpp similarity index 100% rename from rclcpp/src/rclcpp/scope_exit.hpp rename to rclcpp/include/rclcpp/scope_exit.hpp From 741d7013500c74e64ac05c8cb42c7230142b332e Mon Sep 17 00:00:00 2001 From: Jackie Kay Date: Mon, 30 Nov 2015 13:22:54 -0800 Subject: [PATCH 2/2] rename include --- rclcpp/src/rclcpp/executor.cpp | 3 +-- rclcpp/src/rclcpp/executors/multi_threaded_executor.cpp | 3 +-- rclcpp/src/rclcpp/executors/single_threaded_executor.cpp | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/rclcpp/src/rclcpp/executor.cpp b/rclcpp/src/rclcpp/executor.cpp index 7a39c0b..3e77d95 100644 --- a/rclcpp/src/rclcpp/executor.cpp +++ b/rclcpp/src/rclcpp/executor.cpp @@ -13,11 +13,10 @@ // limitations under the License. #include "rclcpp/executor.hpp" +#include "rclcpp/scope_exit.hpp" #include "rcl_interfaces/msg/intra_process_message.hpp" -#include "./scope_exit.hpp" - using rclcpp::executor::AnyExecutable; using rclcpp::executor::Executor; diff --git a/rclcpp/src/rclcpp/executors/multi_threaded_executor.cpp b/rclcpp/src/rclcpp/executors/multi_threaded_executor.cpp index 63d555f..fc393f4 100644 --- a/rclcpp/src/rclcpp/executors/multi_threaded_executor.cpp +++ b/rclcpp/src/rclcpp/executors/multi_threaded_executor.cpp @@ -19,8 +19,7 @@ #include #include "rclcpp/utilities.hpp" - -#include "../scope_exit.hpp" +#include "rclcpp/scope_exit.hpp" using rclcpp::executors::multi_threaded_executor::MultiThreadedExecutor; diff --git a/rclcpp/src/rclcpp/executors/single_threaded_executor.cpp b/rclcpp/src/rclcpp/executors/single_threaded_executor.cpp index 204d422..24b6f97 100644 --- a/rclcpp/src/rclcpp/executors/single_threaded_executor.cpp +++ b/rclcpp/src/rclcpp/executors/single_threaded_executor.cpp @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "../scope_exit.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/scope_exit.hpp" using rclcpp::executors::single_threaded_executor::SingleThreadedExecutor;