Skip to content

Commit f92cc21

Browse files
christophfroehlichchristophfroehlich
authored
Remove visibility macros (#539)
* Remove visibility macros * Remove dead target_compile_definitions
1 parent c6b2326 commit f92cc21

File tree

43 files changed

+39
-937
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+39
-937
lines changed

‎example_1/CMakeLists.txt

+3-5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
55
add_compile_options(-Wall -Wextra)
66
endif()
77

8+
# set the same behavior for windows as it is on linux
9+
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
10+
811
# find dependencies
912
set(THIS_PACKAGE_INCLUDE_DEPENDS
1013
hardware_interface
@@ -19,7 +22,6 @@ foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
1922
find_package(${Dependency} REQUIRED)
2023
endforeach()
2124

22-
2325
## COMPILE
2426
add_library(
2527
ros2_control_demo_example_1
@@ -36,10 +38,6 @@ ament_target_dependencies(
3638
${THIS_PACKAGE_INCLUDE_DEPENDS}
3739
)
3840

39-
# Causes the visibility macros to use dllexport rather than dllimport,
40-
# which is appropriate when building the dll but not consuming it.
41-
target_compile_definitions(${PROJECT_NAME} PRIVATE "ROS2_CONTROL_DEMO_EXAMPLE_1_BUILDING_DLL")
42-
4341
# Export hardware plugins
4442
pluginlib_export_plugin_description_file(hardware_interface ros2_control_demo_example_1.xml)
4543

‎example_1/hardware/include/ros2_control_demo_example_1/rrbot.hpp

-9
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "rclcpp/macros.hpp"
2727
#include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"
2828
#include "rclcpp_lifecycle/state.hpp"
29-
#include "ros2_control_demo_example_1/visibility_control.h"
3029

3130
namespace ros2_control_demo_example_1
3231
{
@@ -35,33 +34,25 @@ class RRBotSystemPositionOnlyHardware : public hardware_interface::SystemInterfa
3534
public:
3635
RCLCPP_SHARED_PTR_DEFINITIONS(RRBotSystemPositionOnlyHardware);
3736

38-
ROS2_CONTROL_DEMO_EXAMPLE_1_PUBLIC
3937
hardware_interface::CallbackReturn on_init(
4038
const hardware_interface::HardwareInfo & info) override;
4139

42-
ROS2_CONTROL_DEMO_EXAMPLE_1_PUBLIC
4340
hardware_interface::CallbackReturn on_configure(
4441
const rclcpp_lifecycle::State & previous_state) override;
4542

46-
ROS2_CONTROL_DEMO_EXAMPLE_1_PUBLIC
4743
std::vector<hardware_interface::StateInterface> export_state_interfaces() override;
4844

49-
ROS2_CONTROL_DEMO_EXAMPLE_1_PUBLIC
5045
std::vector<hardware_interface::CommandInterface> export_command_interfaces() override;
5146

52-
ROS2_CONTROL_DEMO_EXAMPLE_1_PUBLIC
5347
hardware_interface::CallbackReturn on_activate(
5448
const rclcpp_lifecycle::State & previous_state) override;
5549

56-
ROS2_CONTROL_DEMO_EXAMPLE_1_PUBLIC
5750
hardware_interface::CallbackReturn on_deactivate(
5851
const rclcpp_lifecycle::State & previous_state) override;
5952

60-
ROS2_CONTROL_DEMO_EXAMPLE_1_PUBLIC
6153
hardware_interface::return_type read(
6254
const rclcpp::Time & time, const rclcpp::Duration & period) override;
6355

64-
ROS2_CONTROL_DEMO_EXAMPLE_1_PUBLIC
6556
hardware_interface::return_type write(
6657
const rclcpp::Time & time, const rclcpp::Duration & period) override;
6758

‎example_1/hardware/include/ros2_control_demo_example_1/visibility_control.h

-56
This file was deleted.

‎example_10/CMakeLists.txt

+3-5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
55
add_compile_options(-Wall -Wextra)
66
endif()
77

8+
# set the same behavior for windows as it is on linux
9+
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
10+
811
# find dependencies
912
set(THIS_PACKAGE_INCLUDE_DEPENDS
1013
hardware_interface
@@ -22,7 +25,6 @@ foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
2225
find_package(${Dependency} REQUIRED)
2326
endforeach()
2427

25-
2628
## COMPILE
2729
add_library(
2830
ros2_control_demo_example_10
@@ -41,10 +43,6 @@ ament_target_dependencies(
4143
${THIS_PACKAGE_INCLUDE_DEPENDS}
4244
)
4345

44-
# Causes the visibility macros to use dllexport rather than dllimport,
45-
# which is appropriate when building the dll but not consuming it.
46-
target_compile_definitions(${PROJECT_NAME} PRIVATE "ROS2_CONTROL_DEMO_EXAMPLE_10_BUILDING_DLL")
47-
4846
# Export hardware plugins
4947
pluginlib_export_plugin_description_file(hardware_interface ros2_control_demo_example_10.xml)
5048
# Export controllers

‎example_10/controllers/include/ros2_control_demo_example_10/gpio_controller.hpp

-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <vector>
2121

2222
#include "control_msgs/msg/interface_value.hpp"
23-
#include "ros2_control_demo_example_10/visibility_control.h"
2423
#include "std_msgs/msg/float64_multi_array.hpp"
2524

2625
#include "controller_interface/controller_interface.hpp"
@@ -34,26 +33,19 @@ class GPIOController : public controller_interface::ControllerInterface
3433
public:
3534
RCLCPP_SHARED_PTR_DEFINITIONS(GPIOController);
3635

37-
ROS2_CONTROL_DEMO_EXAMPLE_10_PUBLIC
3836
controller_interface::InterfaceConfiguration command_interface_configuration() const override;
3937

40-
ROS2_CONTROL_DEMO_EXAMPLE_10_PUBLIC
4138
controller_interface::InterfaceConfiguration state_interface_configuration() const override;
4239

43-
ROS2_CONTROL_DEMO_EXAMPLE_10_PUBLIC
4440
controller_interface::return_type update(
4541
const rclcpp::Time & time, const rclcpp::Duration & period) override;
4642

47-
ROS2_CONTROL_DEMO_EXAMPLE_10_PUBLIC
4843
CallbackReturn on_configure(const rclcpp_lifecycle::State & previous_state) override;
4944

50-
ROS2_CONTROL_DEMO_EXAMPLE_10_PUBLIC
5145
CallbackReturn on_activate(const rclcpp_lifecycle::State & previous_state) override;
5246

53-
ROS2_CONTROL_DEMO_EXAMPLE_10_PUBLIC
5447
CallbackReturn on_deactivate(const rclcpp_lifecycle::State & previous_state) override;
5548

56-
ROS2_CONTROL_DEMO_EXAMPLE_10_PUBLIC
5749
CallbackReturn on_init() override;
5850

5951
private:

‎example_10/hardware/include/ros2_control_demo_example_10/rrbot.hpp

-9
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "rclcpp/macros.hpp"
2727
#include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"
2828
#include "rclcpp_lifecycle/state.hpp"
29-
#include "ros2_control_demo_example_10/visibility_control.h"
3029

3130
namespace ros2_control_demo_example_10
3231
{
@@ -35,33 +34,25 @@ class RRBotSystemWithGPIOHardware : public hardware_interface::SystemInterface
3534
public:
3635
RCLCPP_SHARED_PTR_DEFINITIONS(RRBotSystemWithGPIOHardware);
3736

38-
ROS2_CONTROL_DEMO_EXAMPLE_10_PUBLIC
3937
hardware_interface::CallbackReturn on_init(
4038
const hardware_interface::HardwareInfo & info) override;
4139

42-
ROS2_CONTROL_DEMO_EXAMPLE_10_PUBLIC
4340
hardware_interface::CallbackReturn on_configure(
4441
const rclcpp_lifecycle::State & previous_state) override;
4542

46-
ROS2_CONTROL_DEMO_EXAMPLE_10_PUBLIC
4743
std::vector<hardware_interface::StateInterface> export_state_interfaces() override;
4844

49-
ROS2_CONTROL_DEMO_EXAMPLE_10_PUBLIC
5045
std::vector<hardware_interface::CommandInterface> export_command_interfaces() override;
5146

52-
ROS2_CONTROL_DEMO_EXAMPLE_10_PUBLIC
5347
hardware_interface::CallbackReturn on_activate(
5448
const rclcpp_lifecycle::State & previous_state) override;
5549

56-
ROS2_CONTROL_DEMO_EXAMPLE_10_PUBLIC
5750
hardware_interface::CallbackReturn on_deactivate(
5851
const rclcpp_lifecycle::State & previous_state) override;
5952

60-
ROS2_CONTROL_DEMO_EXAMPLE_10_PUBLIC
6153
hardware_interface::return_type read(
6254
const rclcpp::Time & time, const rclcpp::Duration & period) override;
6355

64-
ROS2_CONTROL_DEMO_EXAMPLE_10_PUBLIC
6556
hardware_interface::return_type write(
6657
const rclcpp::Time & time, const rclcpp::Duration & period) override;
6758

‎example_10/hardware/include/ros2_control_demo_example_10/visibility_control.h

-56
This file was deleted.

‎example_11/CMakeLists.txt

+3-5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
55
add_compile_options(-Wall -Wextra)
66
endif()
77

8+
# set the same behavior for windows as it is on linux
9+
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
10+
811
# find dependencies
912
set(THIS_PACKAGE_INCLUDE_DEPENDS
1013
hardware_interface
@@ -19,7 +22,6 @@ foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
1922
find_package(${Dependency} REQUIRED)
2023
endforeach()
2124

22-
2325
## COMPILE
2426
add_library(
2527
ros2_control_demo_example_11
@@ -36,10 +38,6 @@ ament_target_dependencies(
3638
${THIS_PACKAGE_INCLUDE_DEPENDS}
3739
)
3840

39-
# Causes the visibility macros to use dllexport rather than dllimport,
40-
# which is appropriate when building the dll but not consuming it.
41-
target_compile_definitions(${PROJECT_NAME} PRIVATE "ROS2_CONTROL_DEMO_EXAMPLE_11_BUILDING_DLL")
42-
4341
# Export hardware plugins
4442
pluginlib_export_plugin_description_file(hardware_interface ros2_control_demo_example_11.xml)
4543

‎example_11/hardware/include/ros2_control_demo_example_11/carlikebot_system.hpp

-9
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
#include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"
3333
#include "rclcpp_lifecycle/state.hpp"
3434

35-
#include "ros2_control_demo_example_11/visibility_control.h"
36-
3735
namespace ros2_control_demo_example_11
3836
{
3937
struct JointValue
@@ -62,29 +60,22 @@ class CarlikeBotSystemHardware : public hardware_interface::SystemInterface
6260
public:
6361
RCLCPP_SHARED_PTR_DEFINITIONS(CarlikeBotSystemHardware);
6462

65-
ROS2_CONTROL_DEMO_EXAMPLE_11_PUBLIC
6663
hardware_interface::CallbackReturn on_init(
6764
const hardware_interface::HardwareInfo & info) override;
6865

69-
ROS2_CONTROL_DEMO_EXAMPLE_11_PUBLIC
7066
std::vector<hardware_interface::StateInterface> export_state_interfaces() override;
7167

72-
ROS2_CONTROL_DEMO_EXAMPLE_11_PUBLIC
7368
std::vector<hardware_interface::CommandInterface> export_command_interfaces() override;
7469

75-
ROS2_CONTROL_DEMO_EXAMPLE_11_PUBLIC
7670
hardware_interface::CallbackReturn on_activate(
7771
const rclcpp_lifecycle::State & previous_state) override;
7872

79-
ROS2_CONTROL_DEMO_EXAMPLE_11_PUBLIC
8073
hardware_interface::CallbackReturn on_deactivate(
8174
const rclcpp_lifecycle::State & previous_state) override;
8275

83-
ROS2_CONTROL_DEMO_EXAMPLE_11_PUBLIC
8476
hardware_interface::return_type read(
8577
const rclcpp::Time & time, const rclcpp::Duration & period) override;
8678

87-
ROS2_CONTROL_DEMO_EXAMPLE_11_PUBLIC
8879
hardware_interface::return_type write(
8980
const rclcpp::Time & time, const rclcpp::Duration & period) override;
9081

0 commit comments

Comments
 (0)