Skip to content

Commit 1688f05

Browse files
authored
Cleanup includes. (#1857)
Remove ones that aren't needed, and add in ones that are actually needed in the respective files. Signed-off-by: Chris Lalancette <[email protected]>
1 parent 80f93d1 commit 1688f05

12 files changed

+28
-37
lines changed

rclcpp/include/rclcpp/experimental/buffers/intra_process_buffer.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#define RCLCPP__EXPERIMENTAL__BUFFERS__INTRA_PROCESS_BUFFER_HPP_
1717

1818
#include <memory>
19+
#include <stdexcept>
1920
#include <type_traits>
2021
#include <utility>
2122

rclcpp/include/rclcpp/experimental/buffers/ring_buffer_implementation.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
#ifndef RCLCPP__EXPERIMENTAL__BUFFERS__RING_BUFFER_IMPLEMENTATION_HPP_
1616
#define RCLCPP__EXPERIMENTAL__BUFFERS__RING_BUFFER_IMPLEMENTATION_HPP_
1717

18-
#include <algorithm>
19-
#include <cstddef>
20-
#include <cstdint>
21-
#include <memory>
2218
#include <mutex>
2319
#include <stdexcept>
2420
#include <utility>

rclcpp/include/rclcpp/experimental/create_intra_process_buffer.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616
#define RCLCPP__EXPERIMENTAL__CREATE_INTRA_PROCESS_BUFFER_HPP_
1717

1818
#include <memory>
19-
#include <type_traits>
19+
#include <stdexcept>
2020
#include <utility>
2121

22-
#include "rcl/subscription.h"
23-
2422
#include "rclcpp/experimental/buffers/intra_process_buffer.hpp"
2523
#include "rclcpp/experimental/buffers/ring_buffer_implementation.hpp"
2624
#include "rclcpp/intra_process_buffer_type.hpp"

rclcpp/include/rclcpp/experimental/executable_list.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#ifndef RCLCPP__EXPERIMENTAL__EXECUTABLE_LIST_HPP_
1616
#define RCLCPP__EXPERIMENTAL__EXECUTABLE_LIST_HPP_
1717

18-
#include <memory>
1918
#include <vector>
2019

2120
#include "rclcpp/client.hpp"

rclcpp/include/rclcpp/experimental/intra_process_manager.hpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,9 @@
1919

2020
#include <shared_mutex>
2121

22-
#include <algorithm>
23-
#include <atomic>
24-
#include <cstdint>
25-
#include <exception>
26-
#include <map>
22+
#include <iterator>
2723
#include <memory>
28-
#include <string>
24+
#include <stdexcept>
2925
#include <unordered_map>
3026
#include <utility>
3127
#include <vector>

rclcpp/include/rclcpp/experimental/subscription_intra_process.hpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,22 @@
1515
#ifndef RCLCPP__EXPERIMENTAL__SUBSCRIPTION_INTRA_PROCESS_HPP_
1616
#define RCLCPP__EXPERIMENTAL__SUBSCRIPTION_INTRA_PROCESS_HPP_
1717

18-
#include <rmw/rmw.h>
18+
#include <rmw/types.h>
1919

20-
#include <functional>
21-
#include <map>
2220
#include <memory>
2321
#include <stdexcept>
2422
#include <string>
23+
#include <type_traits>
2524
#include <utility>
2625

27-
#include "rcl/error_handling.h"
26+
#include "rcl/types.h"
2827

2928
#include "rclcpp/any_subscription_callback.hpp"
29+
#include "rclcpp/context.hpp"
3030
#include "rclcpp/experimental/buffers/intra_process_buffer.hpp"
31-
#include "rclcpp/experimental/create_intra_process_buffer.hpp"
32-
#include "rclcpp/experimental/subscription_intra_process_base.hpp"
3331
#include "rclcpp/experimental/subscription_intra_process_buffer.hpp"
3432
#include "rclcpp/qos.hpp"
3533
#include "rclcpp/type_support_decl.hpp"
36-
#include "rclcpp/waitable.hpp"
3734
#include "tracetools/tracetools.h"
3835

3936
namespace rclcpp

rclcpp/include/rclcpp/experimental/subscription_intra_process_base.hpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,14 @@
1515
#ifndef RCLCPP__EXPERIMENTAL__SUBSCRIPTION_INTRA_PROCESS_BASE_HPP_
1616
#define RCLCPP__EXPERIMENTAL__SUBSCRIPTION_INTRA_PROCESS_BASE_HPP_
1717

18-
#include <rmw/rmw.h>
19-
20-
#include <functional>
2118
#include <memory>
2219
#include <mutex>
2320
#include <string>
24-
#include <utility>
2521

26-
#include "rcl/error_handling.h"
22+
#include "rcl/wait.h"
2723

2824
#include "rclcpp/guard_condition.hpp"
2925
#include "rclcpp/qos.hpp"
30-
#include "rclcpp/type_support_decl.hpp"
3126
#include "rclcpp/waitable.hpp"
3227

3328
namespace rclcpp

rclcpp/include/rclcpp/experimental/subscription_intra_process_buffer.hpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,21 @@
1515
#ifndef RCLCPP__EXPERIMENTAL__SUBSCRIPTION_INTRA_PROCESS_BUFFER_HPP_
1616
#define RCLCPP__EXPERIMENTAL__SUBSCRIPTION_INTRA_PROCESS_BUFFER_HPP_
1717

18-
#include <rmw/rmw.h>
19-
20-
#include <functional>
21-
#include <map>
2218
#include <memory>
2319
#include <string>
2420
#include <stdexcept>
2521
#include <utility>
2622

2723
#include "rcl/error_handling.h"
24+
#include "rcl/guard_condition.h"
25+
#include "rcl/wait.h"
2826

29-
#include "rclcpp/any_subscription_callback.hpp"
3027
#include "rclcpp/experimental/buffers/intra_process_buffer.hpp"
3128
#include "rclcpp/experimental/create_intra_process_buffer.hpp"
3229
#include "rclcpp/experimental/subscription_intra_process_base.hpp"
3330
#include "rclcpp/experimental/ros_message_intra_process_buffer.hpp"
3431
#include "rclcpp/qos.hpp"
3532
#include "rclcpp/type_support_decl.hpp"
36-
#include "rclcpp/waitable.hpp"
37-
#include "tracetools/tracetools.h"
3833

3934
namespace rclcpp
4035
{

rclcpp/include/rclcpp/node_interfaces/node_topics.hpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,16 @@
2020
#include "rcl/publisher.h"
2121
#include "rcl/subscription.h"
2222

23+
#include "rclcpp/callback_group.hpp"
2324
#include "rclcpp/macros.hpp"
2425
#include "rclcpp/node_interfaces/node_base_interface.hpp"
2526
#include "rclcpp/node_interfaces/node_timers_interface.hpp"
2627
#include "rclcpp/node_interfaces/node_topics_interface.hpp"
27-
#include "rclcpp/publisher.hpp"
28+
#include "rclcpp/publisher_base.hpp"
2829
#include "rclcpp/publisher_factory.hpp"
30+
#include "rclcpp/qos.hpp"
31+
#include "rclcpp/subscription_base.hpp"
32+
#include "rclcpp/subscription_factory.hpp"
2933
#include "rclcpp/visibility_control.hpp"
3034

3135
namespace rclcpp

rclcpp/include/rclcpp/publisher.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@
2020
#include <memory>
2121
#include <sstream>
2222
#include <string>
23+
#include <type_traits>
2324
#include <utility>
2425

2526
#include "rcl/error_handling.h"
2627
#include "rcl/publisher.h"
2728
#include "rmw/error_handling.h"
2829
#include "rmw/rmw.h"
30+
#include "rosidl_runtime_cpp/traits.hpp"
2931

3032
#include "rclcpp/allocator/allocator_common.hpp"
3133
#include "rclcpp/allocator/allocator_deleter.hpp"

0 commit comments

Comments
 (0)