From 727ea7165c005861346302a00350fe489f63f5a5 Mon Sep 17 00:00:00 2001 From: Bence Magyar Date: Sat, 28 Dec 2024 10:39:29 +0000 Subject: [PATCH 1/3] Remove header files --- .../visibility_control.h | 52 ----------------- .../visibility_control.h | 49 ---------------- .../visibility_control.h | 52 ----------------- .../visibility_control.h | 56 ------------------- .../effort_controllers/visibility_control.h | 56 ------------------- .../visibility_control.h | 53 ------------------ .../visibility_control.h | 56 ------------------- .../gpio_controllers/visibility_control.h | 49 ---------------- .../visibility_control.hpp | 56 ------------------- .../visibility_control.h | 53 ------------------ .../visibility_control.h | 56 ------------------- .../visibility_control.h | 56 ------------------- .../visibility_control.h | 49 ---------------- .../visibility_control.hpp | 56 ------------------- .../pid_controller/visibility_control.h | 49 ---------------- .../pose_broadcaster/visibility_control.h | 49 ---------------- .../position_controllers/visibility_control.h | 56 ------------------- .../visibility_control.h | 53 ------------------ .../visibility_control.h | 50 ----------------- .../tricycle_controller/visibility_control.h | 53 ------------------ .../visibility_control.h | 52 ----------------- .../velocity_controllers/visibility_control.h | 56 ------------------- 22 files changed, 1167 deletions(-) delete mode 100644 ackermann_steering_controller/include/ackermann_steering_controller/visibility_control.h delete mode 100644 admittance_controller/include/admittance_controller/visibility_control.h delete mode 100644 bicycle_steering_controller/include/bicycle_steering_controller/visibility_control.h delete mode 100644 diff_drive_controller/include/diff_drive_controller/visibility_control.h delete mode 100644 effort_controllers/include/effort_controllers/visibility_control.h delete mode 100644 force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/visibility_control.h delete mode 100644 forward_command_controller/include/forward_command_controller/visibility_control.h delete mode 100644 gpio_controllers/include/gpio_controllers/visibility_control.h delete mode 100644 gripper_controllers/include/gripper_controllers/visibility_control.hpp delete mode 100644 imu_sensor_broadcaster/include/imu_sensor_broadcaster/visibility_control.h delete mode 100644 joint_state_broadcaster/include/joint_state_broadcaster/visibility_control.h delete mode 100644 joint_trajectory_controller/include/joint_trajectory_controller/visibility_control.h delete mode 100644 mecanum_drive_controller/include/mecanum_drive_controller/visibility_control.h delete mode 100644 parallel_gripper_controller/include/parallel_gripper_controller/visibility_control.hpp delete mode 100644 pid_controller/include/pid_controller/visibility_control.h delete mode 100644 pose_broadcaster/include/pose_broadcaster/visibility_control.h delete mode 100644 position_controllers/include/position_controllers/visibility_control.h delete mode 100644 range_sensor_broadcaster/include/range_sensor_broadcaster/visibility_control.h delete mode 100644 steering_controllers_library/include/steering_controllers_library/visibility_control.h delete mode 100644 tricycle_controller/include/tricycle_controller/visibility_control.h delete mode 100644 tricycle_steering_controller/include/tricycle_steering_controller/visibility_control.h delete mode 100644 velocity_controllers/include/velocity_controllers/visibility_control.h diff --git a/ackermann_steering_controller/include/ackermann_steering_controller/visibility_control.h b/ackermann_steering_controller/include/ackermann_steering_controller/visibility_control.h deleted file mode 100644 index 177f0bf87c..0000000000 --- a/ackermann_steering_controller/include/ackermann_steering_controller/visibility_control.h +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) 2023, Stogl Robotics Consulting UG (haftungsbeschränkt) -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef ACKERMANN_STEERING_CONTROLLER__VISIBILITY_CONTROL_H_ -#define ACKERMANN_STEERING_CONTROLLER__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define ACKERMANN_STEERING_CONTROLLER__VISIBILITY_EXPORT __attribute__((dllexport)) -#define ACKERMANN_STEERING_CONTROLLER__VISIBILITY_IMPORT __attribute__((dllimport)) -#else -#define ACKERMANN_STEERING_CONTROLLER__VISIBILITY_EXPORT __declspec(dllexport) -#define ACKERMANN_STEERING_CONTROLLER__VISIBILITY_IMPORT __declspec(dllimport) -#endif -#ifdef ACKERMANN_STEERING_CONTROLLER__VISIBILITY_BUILDING_DLL -#define ACKERMANN_STEERING_CONTROLLER__VISIBILITY_PUBLIC \ - ACKERMANN_STEERING_CONTROLLER__VISIBILITY_EXPORT -#else -#define ACKERMANN_STEERING_CONTROLLER__VISIBILITY_PUBLIC \ - ACKERMANN_STEERING_CONTROLLER__VISIBILITY_IMPORT -#endif -#define ACKERMANN_STEERING_CONTROLLER__VISIBILITY_PUBLIC_TYPE \ - ACKERMANN_STEERING_CONTROLLER__VISIBILITY_PUBLIC -#define ACKERMANN_STEERING_CONTROLLER__VISIBILITY_LOCAL -#else -#define ACKERMANN_STEERING_CONTROLLER__VISIBILITY_EXPORT __attribute__((visibility("default"))) -#define ACKERMANN_STEERING_CONTROLLER__VISIBILITY_IMPORT -#if __GNUC__ >= 4 -#define ACKERMANN_STEERING_CONTROLLER__VISIBILITY_PUBLIC __attribute__((visibility("default"))) -#define ACKERMANN_STEERING_CONTROLLER__VISIBILITY_LOCAL __attribute__((visibility("hidden"))) -#else -#define ACKERMANN_STEERING_CONTROLLER__VISIBILITY_PUBLIC -#define ACKERMANN_STEERING_CONTROLLER__VISIBILITY_LOCAL -#endif -#define ACKERMANN_STEERING_CONTROLLER__VISIBILITY_PUBLIC_TYPE -#endif - -#endif // ACKERMANN_STEERING_CONTROLLER__VISIBILITY_CONTROL_H_ diff --git a/admittance_controller/include/admittance_controller/visibility_control.h b/admittance_controller/include/admittance_controller/visibility_control.h deleted file mode 100644 index 24f17a5c2c..0000000000 --- a/admittance_controller/include/admittance_controller/visibility_control.h +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) 2021, PickNik, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef ADMITTANCE_CONTROLLER__VISIBILITY_CONTROL_H_ -#define ADMITTANCE_CONTROLLER__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define ADMITTANCE_CONTROLLER_EXPORT __attribute__((dllexport)) -#define ADMITTANCE_CONTROLLER_IMPORT __attribute__((dllimport)) -#else -#define ADMITTANCE_CONTROLLER_EXPORT __declspec(dllexport) -#define ADMITTANCE_CONTROLLER_IMPORT __declspec(dllimport) -#endif -#ifdef ADMITTANCE_CONTROLLER_BUILDING_DLL -#define ADMITTANCE_CONTROLLER_PUBLIC ADMITTANCE_CONTROLLER_EXPORT -#else -#define ADMITTANCE_CONTROLLER_PUBLIC ADMITTANCE_CONTROLLER_IMPORT -#endif -#define ADMITTANCE_CONTROLLER_PUBLIC_TYPE ADMITTANCE_CONTROLLER_PUBLIC -#define ADMITTANCE_CONTROLLER_LOCAL -#else -#define ADMITTANCE_CONTROLLER_EXPORT __attribute__((visibility("default"))) -#define ADMITTANCE_CONTROLLER_IMPORT -#if __GNUC__ >= 4 -#define ADMITTANCE_CONTROLLER_PUBLIC __attribute__((visibility("default"))) -#define ADMITTANCE_CONTROLLER_LOCAL __attribute__((visibility("hidden"))) -#else -#define ADMITTANCE_CONTROLLER_PUBLIC -#define ADMITTANCE_CONTROLLER_LOCAL -#endif -#define ADMITTANCE_CONTROLLER_PUBLIC_TYPE -#endif - -#endif // ADMITTANCE_CONTROLLER__VISIBILITY_CONTROL_H_ diff --git a/bicycle_steering_controller/include/bicycle_steering_controller/visibility_control.h b/bicycle_steering_controller/include/bicycle_steering_controller/visibility_control.h deleted file mode 100644 index b076a00215..0000000000 --- a/bicycle_steering_controller/include/bicycle_steering_controller/visibility_control.h +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) 2023, Stogl Robotics Consulting UG (haftungsbeschränkt) -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef BICYCLE_STEERING_CONTROLLER__VISIBILITY_CONTROL_H_ -#define BICYCLE_STEERING_CONTROLLER__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define BICYCLE_STEERING_CONTROLLER__VISIBILITY_EXPORT __attribute__((dllexport)) -#define BICYCLE_STEERING_CONTROLLER__VISIBILITY_IMPORT __attribute__((dllimport)) -#else -#define BICYCLE_STEERING_CONTROLLER__VISIBILITY_EXPORT __declspec(dllexport) -#define BICYCLE_STEERING_CONTROLLER__VISIBILITY_IMPORT __declspec(dllimport) -#endif -#ifdef BICYCLE_STEERING_CONTROLLER__VISIBILITY_BUILDING_DLL -#define BICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC \ - BICYCLE_STEERING_CONTROLLER__VISIBILITY_EXPORT -#else -#define BICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC \ - BICYCLE_STEERING_CONTROLLER__VISIBILITY_IMPORT -#endif -#define BICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC_TYPE \ - BICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC -#define BICYCLE_STEERING_CONTROLLER__VISIBILITY_LOCAL -#else -#define BICYCLE_STEERING_CONTROLLER__VISIBILITY_EXPORT __attribute__((visibility("default"))) -#define BICYCLE_STEERING_CONTROLLER__VISIBILITY_IMPORT -#if __GNUC__ >= 4 -#define BICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC __attribute__((visibility("default"))) -#define BICYCLE_STEERING_CONTROLLER__VISIBILITY_LOCAL __attribute__((visibility("hidden"))) -#else -#define BICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC -#define BICYCLE_STEERING_CONTROLLER__VISIBILITY_LOCAL -#endif -#define BICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC_TYPE -#endif - -#endif // BICYCLE_STEERING_CONTROLLER__VISIBILITY_CONTROL_H_ diff --git a/diff_drive_controller/include/diff_drive_controller/visibility_control.h b/diff_drive_controller/include/diff_drive_controller/visibility_control.h deleted file mode 100644 index 94d78153eb..0000000000 --- a/diff_drive_controller/include/diff_drive_controller/visibility_control.h +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2017 Open Source Robotics Foundation, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/* This header must be included by all rclcpp headers which declare symbols - * which are defined in the rclcpp library. When not building the rclcpp - * library, i.e. when using the headers in other package's code, the contents - * of this header change the visibility of certain symbols which the rclcpp - * library cannot have, but the consuming code must have inorder to link. - */ - -#ifndef DIFF_DRIVE_CONTROLLER__VISIBILITY_CONTROL_H_ -#define DIFF_DRIVE_CONTROLLER__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define DIFF_DRIVE_CONTROLLER_EXPORT __attribute__((dllexport)) -#define DIFF_DRIVE_CONTROLLER_IMPORT __attribute__((dllimport)) -#else -#define DIFF_DRIVE_CONTROLLER_EXPORT __declspec(dllexport) -#define DIFF_DRIVE_CONTROLLER_IMPORT __declspec(dllimport) -#endif -#ifdef DIFF_DRIVE_CONTROLLER_BUILDING_DLL -#define DIFF_DRIVE_CONTROLLER_PUBLIC DIFF_DRIVE_CONTROLLER_EXPORT -#else -#define DIFF_DRIVE_CONTROLLER_PUBLIC DIFF_DRIVE_CONTROLLER_IMPORT -#endif -#define DIFF_DRIVE_CONTROLLER_PUBLIC_TYPE DIFF_DRIVE_CONTROLLER_PUBLIC -#define DIFF_DRIVE_CONTROLLER_LOCAL -#else -#define DIFF_DRIVE_CONTROLLER_EXPORT __attribute__((visibility("default"))) -#define DIFF_DRIVE_CONTROLLER_IMPORT -#if __GNUC__ >= 4 -#define DIFF_DRIVE_CONTROLLER_PUBLIC __attribute__((visibility("default"))) -#define DIFF_DRIVE_CONTROLLER_LOCAL __attribute__((visibility("hidden"))) -#else -#define DIFF_DRIVE_CONTROLLER_PUBLIC -#define DIFF_DRIVE_CONTROLLER_LOCAL -#endif -#define DIFF_DRIVE_CONTROLLER_PUBLIC_TYPE -#endif - -#endif // DIFF_DRIVE_CONTROLLER__VISIBILITY_CONTROL_H_ diff --git a/effort_controllers/include/effort_controllers/visibility_control.h b/effort_controllers/include/effort_controllers/visibility_control.h deleted file mode 100644 index e3ca28355d..0000000000 --- a/effort_controllers/include/effort_controllers/visibility_control.h +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2020 PAL Robotics S.L. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/* This header must be included by all rclcpp headers which declare symbols - * which are defined in the rclcpp library. When not building the rclcpp - * library, i.e. when using the headers in other package's code, the contents - * of this header change the visibility of certain symbols which the rclcpp - * library cannot have, but the consuming code must have inorder to link. - */ - -#ifndef EFFORT_CONTROLLERS__VISIBILITY_CONTROL_H_ -#define EFFORT_CONTROLLERS__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define EFFORT_CONTROLLERS_EXPORT __attribute__((dllexport)) -#define EFFORT_CONTROLLERS_IMPORT __attribute__((dllimport)) -#else -#define EFFORT_CONTROLLERS_EXPORT __declspec(dllexport) -#define EFFORT_CONTROLLERS_IMPORT __declspec(dllimport) -#endif -#ifdef EFFORT_CONTROLLERS_BUILDING_DLL -#define EFFORT_CONTROLLERS_PUBLIC EFFORT_CONTROLLERS_EXPORT -#else -#define EFFORT_CONTROLLERS_PUBLIC EFFORT_CONTROLLERS_IMPORT -#endif -#define EFFORT_CONTROLLERS_PUBLIC_TYPE EFFORT_CONTROLLERS_PUBLIC -#define EFFORT_CONTROLLERS_LOCAL -#else -#define EFFORT_CONTROLLERS_EXPORT __attribute__((visibility("default"))) -#define EFFORT_CONTROLLERS_IMPORT -#if __GNUC__ >= 4 -#define EFFORT_CONTROLLERS_PUBLIC __attribute__((visibility("default"))) -#define EFFORT_CONTROLLERS_LOCAL __attribute__((visibility("hidden"))) -#else -#define EFFORT_CONTROLLERS_PUBLIC -#define EFFORT_CONTROLLERS_LOCAL -#endif -#define EFFORT_CONTROLLERS_PUBLIC_TYPE -#endif - -#endif // EFFORT_CONTROLLERS__VISIBILITY_CONTROL_H_ diff --git a/force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/visibility_control.h b/force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/visibility_control.h deleted file mode 100644 index 1f5295e886..0000000000 --- a/force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/visibility_control.h +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) 2021, Stogl Robotics Consulting UG (haftungsbeschränkt) -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/* - * Author: Subhas Das, Denis Stogl - */ - -#ifndef FORCE_TORQUE_SENSOR_BROADCASTER__VISIBILITY_CONTROL_H_ -#define FORCE_TORQUE_SENSOR_BROADCASTER__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define FORCE_TORQUE_SENSOR_BROADCASTER_EXPORT __attribute__((dllexport)) -#define FORCE_TORQUE_SENSOR_BROADCASTER_IMPORT __attribute__((dllimport)) -#else -#define FORCE_TORQUE_SENSOR_BROADCASTER_EXPORT __declspec(dllexport) -#define FORCE_TORQUE_SENSOR_BROADCASTER_IMPORT __declspec(dllimport) -#endif -#ifdef FORCE_TORQUE_SENSOR_BROADCASTER_BUILDING_DLL -#define FORCE_TORQUE_SENSOR_BROADCASTER_PUBLIC FORCE_TORQUE_SENSOR_BROADCASTER_EXPORT -#else -#define FORCE_TORQUE_SENSOR_BROADCASTER_PUBLIC FORCE_TORQUE_SENSOR_BROADCASTER_IMPORT -#endif -#define FORCE_TORQUE_SENSOR_BROADCASTER_PUBLIC_TYPE FORCE_TORQUE_SENSOR_BROADCASTER_PUBLIC -#define FORCE_TORQUE_SENSOR_BROADCASTER_LOCAL -#else -#define FORCE_TORQUE_SENSOR_BROADCASTER_EXPORT __attribute__((visibility("default"))) -#define FORCE_TORQUE_SENSOR_BROADCASTER_IMPORT -#if __GNUC__ >= 4 -#define FORCE_TORQUE_SENSOR_BROADCASTER_PUBLIC __attribute__((visibility("default"))) -#define FORCE_TORQUE_SENSOR_BROADCASTER_LOCAL __attribute__((visibility("hidden"))) -#else -#define FORCE_TORQUE_SENSOR_BROADCASTER_PUBLIC -#define FORCE_TORQUE_SENSOR_BROADCASTER_LOCAL -#endif -#define FORCE_TORQUE_SENSOR_BROADCASTER_PUBLIC_TYPE -#endif - -#endif // FORCE_TORQUE_SENSOR_BROADCASTER__VISIBILITY_CONTROL_H_ diff --git a/forward_command_controller/include/forward_command_controller/visibility_control.h b/forward_command_controller/include/forward_command_controller/visibility_control.h deleted file mode 100644 index 25a0697fdc..0000000000 --- a/forward_command_controller/include/forward_command_controller/visibility_control.h +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2020 PAL Robotics S.L. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/* This header must be included by all rclcpp headers which declare symbols - * which are defined in the rclcpp library. When not building the rclcpp - * library, i.e. when using the headers in other package's code, the contents - * of this header change the visibility of certain symbols which the rclcpp - * library cannot have, but the consuming code must have inorder to link. - */ - -#ifndef FORWARD_COMMAND_CONTROLLER__VISIBILITY_CONTROL_H_ -#define FORWARD_COMMAND_CONTROLLER__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define FORWARD_COMMAND_CONTROLLER_EXPORT __attribute__((dllexport)) -#define FORWARD_COMMAND_CONTROLLER_IMPORT __attribute__((dllimport)) -#else -#define FORWARD_COMMAND_CONTROLLER_EXPORT __declspec(dllexport) -#define FORWARD_COMMAND_CONTROLLER_IMPORT __declspec(dllimport) -#endif -#ifdef FORWARD_COMMAND_CONTROLLER_BUILDING_DLL -#define FORWARD_COMMAND_CONTROLLER_PUBLIC FORWARD_COMMAND_CONTROLLER_EXPORT -#else -#define FORWARD_COMMAND_CONTROLLER_PUBLIC FORWARD_COMMAND_CONTROLLER_IMPORT -#endif -#define FORWARD_COMMAND_CONTROLLER_PUBLIC_TYPE FORWARD_COMMAND_CONTROLLER_PUBLIC -#define FORWARD_COMMAND_CONTROLLER_LOCAL -#else -#define FORWARD_COMMAND_CONTROLLER_EXPORT __attribute__((visibility("default"))) -#define FORWARD_COMMAND_CONTROLLER_IMPORT -#if __GNUC__ >= 4 -#define FORWARD_COMMAND_CONTROLLER_PUBLIC __attribute__((visibility("default"))) -#define FORWARD_COMMAND_CONTROLLER_LOCAL __attribute__((visibility("hidden"))) -#else -#define FORWARD_COMMAND_CONTROLLER_PUBLIC -#define FORWARD_COMMAND_CONTROLLER_LOCAL -#endif -#define FORWARD_COMMAND_CONTROLLER_PUBLIC_TYPE -#endif - -#endif // FORWARD_COMMAND_CONTROLLER__VISIBILITY_CONTROL_H_ diff --git a/gpio_controllers/include/gpio_controllers/visibility_control.h b/gpio_controllers/include/gpio_controllers/visibility_control.h deleted file mode 100644 index a735a1621c..0000000000 --- a/gpio_controllers/include/gpio_controllers/visibility_control.h +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright 2022 ICUBE Laboratory, University of Strasbourg -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GPIO_CONTROLLERS__VISIBILITY_CONTROL_H_ -#define GPIO_CONTROLLERS__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define GPIO_COMMAND_CONTROLLER_EXPORT __attribute__((dllexport)) -#define GPIO_COMMAND_CONTROLLER_IMPORT __attribute__((dllimport)) -#else -#define GPIO_COMMAND_CONTROLLER_EXPORT __declspec(dllexport) -#define GPIO_COMMAND_CONTROLLER_IMPORT __declspec(dllimport) -#endif -#ifdef GPIO_COMMAND_CONTROLLER_BUILDING_LIBRARY -#define GPIO_COMMAND_CONTROLLER_PUBLIC GPIO_COMMAND_CONTROLLER_EXPORT -#else -#define GPIO_COMMAND_CONTROLLER_PUBLIC GPIO_COMMAND_CONTROLLER_IMPORT -#endif -#define GPIO_COMMAND_CONTROLLER_PUBLIC_TYPE GPIO_COMMAND_CONTROLLER_PUBLIC -#define GPIO_COMMAND_CONTROLLER_LOCAL -#else -#define GPIO_COMMAND_CONTROLLER_EXPORT __attribute__((visibility("default"))) -#define GPIO_COMMAND_CONTROLLER_IMPORT -#if __GNUC__ >= 4 -#define GPIO_COMMAND_CONTROLLER_PUBLIC __attribute__((visibility("default"))) -#define GPIO_COMMAND_CONTROLLER_LOCAL __attribute__((visibility("hidden"))) -#else -#define GPIO_COMMAND_CONTROLLER_PUBLIC -#define GPIO_COMMAND_CONTROLLER_LOCAL -#endif -#define GPIO_COMMAND_CONTROLLER_PUBLIC_TYPE -#endif - -#endif // GPIO_CONTROLLERS__VISIBILITY_CONTROL_H_ diff --git a/gripper_controllers/include/gripper_controllers/visibility_control.hpp b/gripper_controllers/include/gripper_controllers/visibility_control.hpp deleted file mode 100644 index 76b8dafe54..0000000000 --- a/gripper_controllers/include/gripper_controllers/visibility_control.hpp +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2017 Open Source Robotics Foundation, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/* This header must be included by all rclcpp headers which declare symbols - * which are defined in the rclcpp library. When not building the rclcpp - * library, i.e. when using the headers in other package's code, the contents - * of this header change the visibility of certain symbols which the rclcpp - * library cannot have, but the consuming code must have inorder to link. - */ - -#ifndef GRIPPER_CONTROLLERS__VISIBILITY_CONTROL_HPP_ -#define GRIPPER_CONTROLLERS__VISIBILITY_CONTROL_HPP_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define GRIPPER_ACTION_CONTROLLER_EXPORT __attribute__((dllexport)) -#define GRIPPER_ACTION_CONTROLLER_IMPORT __attribute__((dllimport)) -#else -#define GRIPPER_ACTION_CONTROLLER_EXPORT __declspec(dllexport) -#define GRIPPER_ACTION_CONTROLLER_IMPORT __declspec(dllimport) -#endif -#ifdef GRIPPER_ACTION_CONTROLLER_BUILDING_DLL -#define GRIPPER_ACTION_CONTROLLER_PUBLIC GRIPPER_ACTION_CONTROLLER_EXPORT -#else -#define GRIPPER_ACTION_CONTROLLER_PUBLIC GRIPPER_ACTION_CONTROLLER_IMPORT -#endif -#define GRIPPER_ACTION_CONTROLLER_PUBLIC_TYPE GRIPPER_ACTION_CONTROLLER_PUBLIC -#define GRIPPER_ACTION_CONTROLLER_LOCAL -#else -#define GRIPPER_ACTION_CONTROLLER_EXPORT __attribute__((visibility("default"))) -#define GRIPPER_ACTION_CONTROLLER_IMPORT -#if __GNUC__ >= 4 -#define GRIPPER_ACTION_CONTROLLER_PUBLIC __attribute__((visibility("default"))) -#define GRIPPER_ACTION_CONTROLLER_LOCAL __attribute__((visibility("hidden"))) -#else -#define GRIPPER_ACTION_CONTROLLER_PUBLIC -#define GRIPPER_ACTION_CONTROLLER_LOCAL -#endif -#define GRIPPER_ACTION_CONTROLLER_PUBLIC_TYPE -#endif - -#endif // GRIPPER_CONTROLLERS__VISIBILITY_CONTROL_HPP_ diff --git a/imu_sensor_broadcaster/include/imu_sensor_broadcaster/visibility_control.h b/imu_sensor_broadcaster/include/imu_sensor_broadcaster/visibility_control.h deleted file mode 100644 index fbac130a07..0000000000 --- a/imu_sensor_broadcaster/include/imu_sensor_broadcaster/visibility_control.h +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) 2021, Stogl Robotics Consulting UG (haftungsbeschränkt) -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/* - * Author: Subhas Das, Denis Stogl - */ - -#ifndef IMU_SENSOR_BROADCASTER__VISIBILITY_CONTROL_H_ -#define IMU_SENSOR_BROADCASTER__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define IMU_SENSOR_BROADCASTER_EXPORT __attribute__((dllexport)) -#define IMU_SENSOR_BROADCASTER_IMPORT __attribute__((dllimport)) -#else -#define IMU_SENSOR_BROADCASTER_EXPORT __declspec(dllexport) -#define IMU_SENSOR_BROADCASTER_IMPORT __declspec(dllimport) -#endif -#ifdef IMU_SENSOR_BROADCASTER_BUILDING_DLL -#define IMU_SENSOR_BROADCASTER_PUBLIC IMU_SENSOR_BROADCASTER_EXPORT -#else -#define IMU_SENSOR_BROADCASTER_PUBLIC IMU_SENSOR_BROADCASTER_IMPORT -#endif -#define IMU_SENSOR_BROADCASTER_PUBLIC_TYPE IMU_SENSOR_BROADCASTER_PUBLIC -#define IMU_SENSOR_BROADCASTER_LOCAL -#else -#define IMU_SENSOR_BROADCASTER_EXPORT __attribute__((visibility("default"))) -#define IMU_SENSOR_BROADCASTER_IMPORT -#if __GNUC__ >= 4 -#define IMU_SENSOR_BROADCASTER_PUBLIC __attribute__((visibility("default"))) -#define IMU_SENSOR_BROADCASTER_LOCAL __attribute__((visibility("hidden"))) -#else -#define IMU_SENSOR_BROADCASTER_PUBLIC -#define IMU_SENSOR_BROADCASTER_LOCAL -#endif -#define IMU_SENSOR_BROADCASTER_PUBLIC_TYPE -#endif - -#endif // IMU_SENSOR_BROADCASTER__VISIBILITY_CONTROL_H_ diff --git a/joint_state_broadcaster/include/joint_state_broadcaster/visibility_control.h b/joint_state_broadcaster/include/joint_state_broadcaster/visibility_control.h deleted file mode 100644 index 8bbe0fcd73..0000000000 --- a/joint_state_broadcaster/include/joint_state_broadcaster/visibility_control.h +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2017 Open Source Robotics Foundation, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/* This header must be included by all rclcpp headers which declare symbols - * which are defined in the rclcpp library. When not building the rclcpp - * library, i.e. when using the headers in other package's code, the contents - * of this header change the visibility of certain symbols which the rclcpp - * library cannot have, but the consuming code must have inorder to link. - */ - -#ifndef JOINT_STATE_BROADCASTER__VISIBILITY_CONTROL_H_ -#define JOINT_STATE_BROADCASTER__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define JOINT_STATE_BROADCASTER_EXPORT __attribute__((dllexport)) -#define JOINT_STATE_BROADCASTER_IMPORT __attribute__((dllimport)) -#else -#define JOINT_STATE_BROADCASTER_EXPORT __declspec(dllexport) -#define JOINT_STATE_BROADCASTER_IMPORT __declspec(dllimport) -#endif -#ifdef JOINT_STATE_BROADCASTER_BUILDING_DLL -#define JOINT_STATE_BROADCASTER_PUBLIC JOINT_STATE_BROADCASTER_EXPORT -#else -#define JOINT_STATE_BROADCASTER_PUBLIC JOINT_STATE_BROADCASTER_IMPORT -#endif -#define JOINT_STATE_BROADCASTER_PUBLIC_TYPE JOINT_STATE_BROADCASTER_PUBLIC -#define JOINT_STATE_BROADCASTER_LOCAL -#else -#define JOINT_STATE_BROADCASTER_EXPORT __attribute__((visibility("default"))) -#define JOINT_STATE_BROADCASTER_IMPORT -#if __GNUC__ >= 4 -#define JOINT_STATE_BROADCASTER_PUBLIC __attribute__((visibility("default"))) -#define JOINT_STATE_BROADCASTER_LOCAL __attribute__((visibility("hidden"))) -#else -#define JOINT_STATE_BROADCASTER_PUBLIC -#define JOINT_STATE_BROADCASTER_LOCAL -#endif -#define JOINT_STATE_BROADCASTER_PUBLIC_TYPE -#endif - -#endif // JOINT_STATE_BROADCASTER__VISIBILITY_CONTROL_H_ diff --git a/joint_trajectory_controller/include/joint_trajectory_controller/visibility_control.h b/joint_trajectory_controller/include/joint_trajectory_controller/visibility_control.h deleted file mode 100644 index ec44da7a2f..0000000000 --- a/joint_trajectory_controller/include/joint_trajectory_controller/visibility_control.h +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2017 Open Source Robotics Foundation, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/* This header must be included by all rclcpp headers which declare symbols - * which are defined in the rclcpp library. When not building the rclcpp - * library, i.e. when using the headers in other package's code, the contents - * of this header change the visibility of certain symbols which the rclcpp - * library cannot have, but the consuming code must have inorder to link. - */ - -#ifndef JOINT_TRAJECTORY_CONTROLLER__VISIBILITY_CONTROL_H_ -#define JOINT_TRAJECTORY_CONTROLLER__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define JOINT_TRAJECTORY_CONTROLLER_EXPORT __attribute__((dllexport)) -#define JOINT_TRAJECTORY_CONTROLLER_IMPORT __attribute__((dllimport)) -#else -#define JOINT_TRAJECTORY_CONTROLLER_EXPORT __declspec(dllexport) -#define JOINT_TRAJECTORY_CONTROLLER_IMPORT __declspec(dllimport) -#endif -#ifdef JOINT_TRAJECTORY_CONTROLLER_BUILDING_DLL -#define JOINT_TRAJECTORY_CONTROLLER_PUBLIC JOINT_TRAJECTORY_CONTROLLER_EXPORT -#else -#define JOINT_TRAJECTORY_CONTROLLER_PUBLIC JOINT_TRAJECTORY_CONTROLLER_IMPORT -#endif -#define JOINT_TRAJECTORY_CONTROLLER_PUBLIC_TYPE JOINT_TRAJECTORY_CONTROLLER_PUBLIC -#define JOINT_TRAJECTORY_CONTROLLER_LOCAL -#else -#define JOINT_TRAJECTORY_CONTROLLER_EXPORT __attribute__((visibility("default"))) -#define JOINT_TRAJECTORY_CONTROLLER_IMPORT -#if __GNUC__ >= 4 -#define JOINT_TRAJECTORY_CONTROLLER_PUBLIC __attribute__((visibility("default"))) -#define JOINT_TRAJECTORY_CONTROLLER_LOCAL __attribute__((visibility("hidden"))) -#else -#define JOINT_TRAJECTORY_CONTROLLER_PUBLIC -#define JOINT_TRAJECTORY_CONTROLLER_LOCAL -#endif -#define JOINT_TRAJECTORY_CONTROLLER_PUBLIC_TYPE -#endif - -#endif // JOINT_TRAJECTORY_CONTROLLER__VISIBILITY_CONTROL_H_ diff --git a/mecanum_drive_controller/include/mecanum_drive_controller/visibility_control.h b/mecanum_drive_controller/include/mecanum_drive_controller/visibility_control.h deleted file mode 100644 index 3222b2fa52..0000000000 --- a/mecanum_drive_controller/include/mecanum_drive_controller/visibility_control.h +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) 2023, Stogl Robotics Consulting UG (haftungsbeschränkt) -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef MECANUM_DRIVE_CONTROLLER__VISIBILITY_CONTROL_H_ -#define MECANUM_DRIVE_CONTROLLER__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define MECANUM_DRIVE_CONTROLLER__VISIBILITY_EXPORT __attribute__((dllexport)) -#define MECANUM_DRIVE_CONTROLLER__VISIBILITY_IMPORT __attribute__((dllimport)) -#else -#define MECANUM_DRIVE_CONTROLLER__VISIBILITY_EXPORT __declspec(dllexport) -#define MECANUM_DRIVE_CONTROLLER__VISIBILITY_IMPORT __declspec(dllimport) -#endif -#ifdef MECANUM_DRIVE_CONTROLLER__VISIBILITY_BUILDING_DLL -#define MECANUM_DRIVE_CONTROLLER__VISIBILITY_PUBLIC MECANUM_DRIVE_CONTROLLER__VISIBILITY_EXPORT -#else -#define MECANUM_DRIVE_CONTROLLER__VISIBILITY_PUBLIC MECANUM_DRIVE_CONTROLLER__VISIBILITY_IMPORT -#endif -#define MECANUM_DRIVE_CONTROLLER__VISIBILITY_PUBLIC_TYPE MECANUM_DRIVE_CONTROLLER__VISIBILITY_PUBLIC -#define MECANUM_DRIVE_CONTROLLER__VISIBILITY_LOCAL -#else -#define MECANUM_DRIVE_CONTROLLER__VISIBILITY_EXPORT __attribute__((visibility("default"))) -#define MECANUM_DRIVE_CONTROLLER__VISIBILITY_IMPORT -#if __GNUC__ >= 4 -#define MECANUM_DRIVE_CONTROLLER__VISIBILITY_PUBLIC __attribute__((visibility("default"))) -#define MECANUM_DRIVE_CONTROLLER__VISIBILITY_LOCAL __attribute__((visibility("hidden"))) -#else -#define MECANUM_DRIVE_CONTROLLER__VISIBILITY_PUBLIC -#define MECANUM_DRIVE_CONTROLLER__VISIBILITY_LOCAL -#endif -#define MECANUM_DRIVE_CONTROLLER__VISIBILITY_PUBLIC_TYPE -#endif - -#endif // MECANUM_DRIVE_CONTROLLER__VISIBILITY_CONTROL_H_ diff --git a/parallel_gripper_controller/include/parallel_gripper_controller/visibility_control.hpp b/parallel_gripper_controller/include/parallel_gripper_controller/visibility_control.hpp deleted file mode 100644 index 63e5c8e1c7..0000000000 --- a/parallel_gripper_controller/include/parallel_gripper_controller/visibility_control.hpp +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2017 Open Source Robotics Foundation, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/* This header must be included by all rclcpp headers which declare symbols - * which are defined in the rclcpp library. When not building the rclcpp - * library, i.e. when using the headers in other package's code, the contents - * of this header change the visibility of certain symbols which the rclcpp - * library cannot have, but the consuming code must have inorder to link. - */ - -#ifndef PARALLEL_GRIPPER_CONTROLLER__VISIBILITY_CONTROL_HPP_ -#define PARALLEL_GRIPPER_CONTROLLER__VISIBILITY_CONTROL_HPP_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define GRIPPER_ACTION_CONTROLLER_EXPORT __attribute__((dllexport)) -#define GRIPPER_ACTION_CONTROLLER_IMPORT __attribute__((dllimport)) -#else -#define GRIPPER_ACTION_CONTROLLER_EXPORT __declspec(dllexport) -#define GRIPPER_ACTION_CONTROLLER_IMPORT __declspec(dllimport) -#endif -#ifdef GRIPPER_ACTION_CONTROLLER_BUILDING_DLL -#define GRIPPER_ACTION_CONTROLLER_PUBLIC GRIPPER_ACTION_CONTROLLER_EXPORT -#else -#define GRIPPER_ACTION_CONTROLLER_PUBLIC GRIPPER_ACTION_CONTROLLER_IMPORT -#endif -#define GRIPPER_ACTION_CONTROLLER_PUBLIC_TYPE GRIPPER_ACTION_CONTROLLER_PUBLIC -#define GRIPPER_ACTION_CONTROLLER_LOCAL -#else -#define GRIPPER_ACTION_CONTROLLER_EXPORT __attribute__((visibility("default"))) -#define GRIPPER_ACTION_CONTROLLER_IMPORT -#if __GNUC__ >= 4 -#define GRIPPER_ACTION_CONTROLLER_PUBLIC __attribute__((visibility("default"))) -#define GRIPPER_ACTION_CONTROLLER_LOCAL __attribute__((visibility("hidden"))) -#else -#define GRIPPER_ACTION_CONTROLLER_PUBLIC -#define GRIPPER_ACTION_CONTROLLER_LOCAL -#endif -#define GRIPPER_ACTION_CONTROLLER_PUBLIC_TYPE -#endif - -#endif // PARALLEL_GRIPPER_CONTROLLER__VISIBILITY_CONTROL_HPP_ diff --git a/pid_controller/include/pid_controller/visibility_control.h b/pid_controller/include/pid_controller/visibility_control.h deleted file mode 100644 index 1509364b5a..0000000000 --- a/pid_controller/include/pid_controller/visibility_control.h +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) 2023, Stogl Robotics Consulting UG (haftungsbeschränkt) -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef PID_CONTROLLER__VISIBILITY_CONTROL_H_ -#define PID_CONTROLLER__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define PID_CONTROLLER__VISIBILITY_EXPORT __attribute__((dllexport)) -#define PID_CONTROLLER__VISIBILITY_IMPORT __attribute__((dllimport)) -#else -#define PID_CONTROLLER__VISIBILITY_EXPORT __declspec(dllexport) -#define PID_CONTROLLER__VISIBILITY_IMPORT __declspec(dllimport) -#endif -#ifdef PID_CONTROLLER__VISIBILITY_BUILDING_DLL -#define PID_CONTROLLER__VISIBILITY_PUBLIC PID_CONTROLLER__VISIBILITY_EXPORT -#else -#define PID_CONTROLLER__VISIBILITY_PUBLIC PID_CONTROLLER__VISIBILITY_IMPORT -#endif -#define PID_CONTROLLER__VISIBILITY_PUBLIC_TYPE PID_CONTROLLER__VISIBILITY_PUBLIC -#define PID_CONTROLLER__VISIBILITY_LOCAL -#else -#define PID_CONTROLLER__VISIBILITY_EXPORT __attribute__((visibility("default"))) -#define PID_CONTROLLER__VISIBILITY_IMPORT -#if __GNUC__ >= 4 -#define PID_CONTROLLER__VISIBILITY_PUBLIC __attribute__((visibility("default"))) -#define PID_CONTROLLER__VISIBILITY_LOCAL __attribute__((visibility("hidden"))) -#else -#define PID_CONTROLLER__VISIBILITY_PUBLIC -#define PID_CONTROLLER__VISIBILITY_LOCAL -#endif -#define PID_CONTROLLER__VISIBILITY_PUBLIC_TYPE -#endif - -#endif // PID_CONTROLLER__VISIBILITY_CONTROL_H_ diff --git a/pose_broadcaster/include/pose_broadcaster/visibility_control.h b/pose_broadcaster/include/pose_broadcaster/visibility_control.h deleted file mode 100644 index 5ce272658d..0000000000 --- a/pose_broadcaster/include/pose_broadcaster/visibility_control.h +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright 2024 FZI Forschungszentrum Informatik -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef POSE_BROADCASTER__VISIBILITY_CONTROL_H_ -#define POSE_BROADCASTER__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define POSE_BROADCASTER_EXPORT __attribute__((dllexport)) -#define POSE_BROADCASTER_IMPORT __attribute__((dllimport)) -#else -#define POSE_BROADCASTER_EXPORT __declspec(dllexport) -#define POSE_BROADCASTER_IMPORT __declspec(dllimport) -#endif -#ifdef POSE_BROADCASTER_BUILDING_DLL -#define POSE_BROADCASTER_PUBLIC POSE_BROADCASTER_EXPORT -#else -#define POSE_BROADCASTER_PUBLIC POSE_BROADCASTER_IMPORT -#endif -#define POSE_BROADCASTER_PUBLIC_TYPE POSE_BROADCASTER_PUBLIC -#define POSE_BROADCASTER_LOCAL -#else -#define POSE_BROADCASTER_EXPORT __attribute__((visibility("default"))) -#define POSE_BROADCASTER_IMPORT -#if __GNUC__ >= 4 -#define POSE_BROADCASTER_PUBLIC __attribute__((visibility("default"))) -#define POSE_BROADCASTER_LOCAL __attribute__((visibility("hidden"))) -#else -#define POSE_BROADCASTER_PUBLIC -#define POSE_BROADCASTER_LOCAL -#endif -#define POSE_BROADCASTER_PUBLIC_TYPE -#endif - -#endif // POSE_BROADCASTER__VISIBILITY_CONTROL_H_ diff --git a/position_controllers/include/position_controllers/visibility_control.h b/position_controllers/include/position_controllers/visibility_control.h deleted file mode 100644 index cac7aebc5a..0000000000 --- a/position_controllers/include/position_controllers/visibility_control.h +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2020 PAL Robotics S.L. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/* This header must be included by all rclcpp headers which declare symbols - * which are defined in the rclcpp library. When not building the rclcpp - * library, i.e. when using the headers in other package's code, the contents - * of this header change the visibility of certain symbols which the rclcpp - * library cannot have, but the consuming code must have inorder to link. - */ - -#ifndef POSITION_CONTROLLERS__VISIBILITY_CONTROL_H_ -#define POSITION_CONTROLLERS__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define POSITION_CONTROLLERS_EXPORT __attribute__((dllexport)) -#define POSITION_CONTROLLERS_IMPORT __attribute__((dllimport)) -#else -#define POSITION_CONTROLLERS_EXPORT __declspec(dllexport) -#define POSITION_CONTROLLERS_IMPORT __declspec(dllimport) -#endif -#ifdef POSITION_CONTROLLERS_BUILDING_DLL -#define POSITION_CONTROLLERS_PUBLIC POSITION_CONTROLLERS_EXPORT -#else -#define POSITION_CONTROLLERS_PUBLIC POSITION_CONTROLLERS_IMPORT -#endif -#define POSITION_CONTROLLERS_PUBLIC_TYPE POSITION_CONTROLLERS_PUBLIC -#define POSITION_CONTROLLERS_LOCAL -#else -#define POSITION_CONTROLLERS_EXPORT __attribute__((visibility("default"))) -#define POSITION_CONTROLLERS_IMPORT -#if __GNUC__ >= 4 -#define POSITION_CONTROLLERS_PUBLIC __attribute__((visibility("default"))) -#define POSITION_CONTROLLERS_LOCAL __attribute__((visibility("hidden"))) -#else -#define POSITION_CONTROLLERS_PUBLIC -#define POSITION_CONTROLLERS_LOCAL -#endif -#define POSITION_CONTROLLERS_PUBLIC_TYPE -#endif - -#endif // POSITION_CONTROLLERS__VISIBILITY_CONTROL_H_ diff --git a/range_sensor_broadcaster/include/range_sensor_broadcaster/visibility_control.h b/range_sensor_broadcaster/include/range_sensor_broadcaster/visibility_control.h deleted file mode 100644 index 0a9a9f53a8..0000000000 --- a/range_sensor_broadcaster/include/range_sensor_broadcaster/visibility_control.h +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) 2021, Stogl Robotics Consulting UG (haftungsbeschränkt) -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/* - * Author: Subhas Das, Denis Stogl - */ - -#ifndef RANGE_SENSOR_BROADCASTER__VISIBILITY_CONTROL_H_ -#define RANGE_SENSOR_BROADCASTER__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define RANGE_SENSOR_BROADCASTER_EXPORT __attribute__((dllexport)) -#define RANGE_SENSOR_BROADCASTER_IMPORT __attribute__((dllimport)) -#else -#define RANGE_SENSOR_BROADCASTER_EXPORT __declspec(dllexport) -#define RANGE_SENSOR_BROADCASTER_IMPORT __declspec(dllimport) -#endif -#ifdef RANGE_SENSOR_BROADCASTER_BUILDING_DLL -#define RANGE_SENSOR_BROADCASTER_PUBLIC RANGE_SENSOR_BROADCASTER_EXPORT -#else -#define RANGE_SENSOR_BROADCASTER_PUBLIC RANGE_SENSOR_BROADCASTER_IMPORT -#endif -#define RANGE_SENSOR_BROADCASTER_PUBLIC_TYPE RANGE_SENSOR_BROADCASTER_PUBLIC -#define RANGE_SENSOR_BROADCASTER_LOCAL -#else -#define RANGE_SENSOR_BROADCASTER_EXPORT __attribute__((visibility("default"))) -#define RANGE_SENSOR_BROADCASTER_IMPORT -#if __GNUC__ >= 4 -#define RANGE_SENSOR_BROADCASTER_PUBLIC __attribute__((visibility("default"))) -#define RANGE_SENSOR_BROADCASTER_LOCAL __attribute__((visibility("hidden"))) -#else -#define RANGE_SENSOR_BROADCASTER_PUBLIC -#define RANGE_SENSOR_BROADCASTER_LOCAL -#endif -#define RANGE_SENSOR_BROADCASTER_PUBLIC_TYPE -#endif - -#endif // RANGE_SENSOR_BROADCASTER__VISIBILITY_CONTROL_H_ diff --git a/steering_controllers_library/include/steering_controllers_library/visibility_control.h b/steering_controllers_library/include/steering_controllers_library/visibility_control.h deleted file mode 100644 index 123662031b..0000000000 --- a/steering_controllers_library/include/steering_controllers_library/visibility_control.h +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) 2023, Stogl Robotics Consulting UG (haftungsbeschränkt) -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef STEERING_CONTROLLERS_LIBRARY__VISIBILITY_CONTROL_H_ -#define STEERING_CONTROLLERS_LIBRARY__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define STEERING_CONTROLLERS__VISIBILITY_EXPORT __attribute__((dllexport)) -#define STEERING_CONTROLLERS__VISIBILITY_IMPORT __attribute__((dllimport)) -#else -#define STEERING_CONTROLLERS__VISIBILITY_EXPORT __declspec(dllexport) -#define STEERING_CONTROLLERS__VISIBILITY_IMPORT __declspec(dllimport) -#endif -#ifdef STEERING_CONTROLLERS__VISIBILITY_BUILDING_DLL -#define STEERING_CONTROLLERS__VISIBILITY_PUBLIC STEERING_CONTROLLERS__VISIBILITY_EXPORT -#else -#define STEERING_CONTROLLERS__VISIBILITY_PUBLIC STEERING_CONTROLLERS__VISIBILITY_IMPORT -#endif -#define STEERING_CONTROLLERS__VISIBILITY_PUBLIC_TYPE STEERING_CONTROLLERS__VISIBILITY_PUBLIC -#define STEERING_CONTROLLERS__VISIBILITY_LOCAL -#else -#define STEERING_CONTROLLERS__VISIBILITY_EXPORT __attribute__((visibility("default"))) -#define STEERING_CONTROLLERS__VISIBILITY_IMPORT -#if __GNUC__ >= 4 -#define STEERING_CONTROLLERS__VISIBILITY_PUBLIC __attribute__((visibility("default"))) -#define STEERING_CONTROLLERS__VISIBILITY_PROTECTED __attribute__((visibility("protected"))) -#define STEERING_CONTROLLERS__VISIBILITY_LOCAL __attribute__((visibility("hidden"))) -#else -#define STEERING_CONTROLLERS__VISIBILITY_PUBLIC -#define STEERING_CONTROLLERS__VISIBILITY_LOCAL -#endif -#define STEERING_CONTROLLERS__VISIBILITY_PUBLIC_TYPE -#endif - -#endif // STEERING_CONTROLLERS_LIBRARY__VISIBILITY_CONTROL_H_ diff --git a/tricycle_controller/include/tricycle_controller/visibility_control.h b/tricycle_controller/include/tricycle_controller/visibility_control.h deleted file mode 100644 index bc9b34898b..0000000000 --- a/tricycle_controller/include/tricycle_controller/visibility_control.h +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright 2022 Pixel Robotics. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/* - * Author: Tony Najjar - */ - -#ifndef TRICYCLE_CONTROLLER__VISIBILITY_CONTROL_H_ -#define TRICYCLE_CONTROLLER__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define TRICYCLE_CONTROLLER_EXPORT __attribute__((dllexport)) -#define TRICYCLE_CONTROLLER_IMPORT __attribute__((dllimport)) -#else -#define TRICYCLE_CONTROLLER_EXPORT __declspec(dllexport) -#define TRICYCLE_CONTROLLER_IMPORT __declspec(dllimport) -#endif -#ifdef TRICYCLE_CONTROLLER_BUILDING_DLL -#define TRICYCLE_CONTROLLER_PUBLIC TRICYCLE_CONTROLLER_EXPORT -#else -#define TRICYCLE_CONTROLLER_PUBLIC TRICYCLE_CONTROLLER_IMPORT -#endif -#define TRICYCLE_CONTROLLER_PUBLIC_TYPE TRICYCLE_CONTROLLER_PUBLIC -#define TRICYCLE_CONTROLLER_LOCAL -#else -#define TRICYCLE_CONTROLLER_EXPORT __attribute__((visibility("default"))) -#define TRICYCLE_CONTROLLER_IMPORT -#if __GNUC__ >= 4 -#define TRICYCLE_CONTROLLER_PUBLIC __attribute__((visibility("default"))) -#define TRICYCLE_CONTROLLER_LOCAL __attribute__((visibility("hidden"))) -#else -#define TRICYCLE_CONTROLLER_PUBLIC -#define TRICYCLE_CONTROLLER_LOCAL -#endif -#define TRICYCLE_CONTROLLER_PUBLIC_TYPE -#endif - -#endif // TRICYCLE_CONTROLLER__VISIBILITY_CONTROL_H_ diff --git a/tricycle_steering_controller/include/tricycle_steering_controller/visibility_control.h b/tricycle_steering_controller/include/tricycle_steering_controller/visibility_control.h deleted file mode 100644 index 606b067ad8..0000000000 --- a/tricycle_steering_controller/include/tricycle_steering_controller/visibility_control.h +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) 2023, Stogl Robotics Consulting UG (haftungsbeschränkt) -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef TRICYCLE_STEERING_CONTROLLER__VISIBILITY_CONTROL_H_ -#define TRICYCLE_STEERING_CONTROLLER__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define TRICYCLE_STEERING_CONTROLLER__VISIBILITY_EXPORT __attribute__((dllexport)) -#define TRICYCLE_STEERING_CONTROLLER__VISIBILITY_IMPORT __attribute__((dllimport)) -#else -#define TRICYCLE_STEERING_CONTROLLER__VISIBILITY_EXPORT __declspec(dllexport) -#define TRICYCLE_STEERING_CONTROLLER__VISIBILITY_IMPORT __declspec(dllimport) -#endif -#ifdef TRICYCLE_STEERING_CONTROLLER__VISIBILITY_BUILDING_DLL -#define TRICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC \ - TRICYCLE_STEERING_CONTROLLER__VISIBILITY_EXPORT -#else -#define TRICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC \ - TRICYCLE_STEERING_CONTROLLER__VISIBILITY_IMPORT -#endif -#define TRICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC_TYPE \ - TRICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC -#define TRICYCLE_STEERING_CONTROLLER__VISIBILITY_LOCAL -#else -#define TRICYCLE_STEERING_CONTROLLER__VISIBILITY_EXPORT __attribute__((visibility("default"))) -#define TRICYCLE_STEERING_CONTROLLER__VISIBILITY_IMPORT -#if __GNUC__ >= 4 -#define TRICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC __attribute__((visibility("default"))) -#define TRICYCLE_STEERING_CONTROLLER__VISIBILITY_LOCAL __attribute__((visibility("hidden"))) -#else -#define TRICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC -#define TRICYCLE_STEERING_CONTROLLER__VISIBILITY_LOCAL -#endif -#define TRICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC_TYPE -#endif - -#endif // TRICYCLE_STEERING_CONTROLLER__VISIBILITY_CONTROL_H_ diff --git a/velocity_controllers/include/velocity_controllers/visibility_control.h b/velocity_controllers/include/velocity_controllers/visibility_control.h deleted file mode 100644 index 08b4ecc588..0000000000 --- a/velocity_controllers/include/velocity_controllers/visibility_control.h +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2020 PAL Robotics S.L. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/* This header must be included by all rclcpp headers which declare symbols - * which are defined in the rclcpp library. When not building the rclcpp - * library, i.e. when using the headers in other package's code, the contents - * of this header change the visibility of certain symbols which the rclcpp - * library cannot have, but the consuming code must have inorder to link. - */ - -#ifndef VELOCITY_CONTROLLERS__VISIBILITY_CONTROL_H_ -#define VELOCITY_CONTROLLERS__VISIBILITY_CONTROL_H_ - -// This logic was borrowed (then namespaced) from the examples on the gcc wiki: -// https://gcc.gnu.org/wiki/Visibility - -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define VELOCITY_CONTROLLERS_EXPORT __attribute__((dllexport)) -#define VELOCITY_CONTROLLERS_IMPORT __attribute__((dllimport)) -#else -#define VELOCITY_CONTROLLERS_EXPORT __declspec(dllexport) -#define VELOCITY_CONTROLLERS_IMPORT __declspec(dllimport) -#endif -#ifdef VELOCITY_CONTROLLERS_BUILDING_DLL -#define VELOCITY_CONTROLLERS_PUBLIC VELOCITY_CONTROLLERS_EXPORT -#else -#define VELOCITY_CONTROLLERS_PUBLIC VELOCITY_CONTROLLERS_IMPORT -#endif -#define VELOCITY_CONTROLLERS_PUBLIC_TYPE VELOCITY_CONTROLLERS_PUBLIC -#define VELOCITY_CONTROLLERS_LOCAL -#else -#define VELOCITY_CONTROLLERS_EXPORT __attribute__((visibility("default"))) -#define VELOCITY_CONTROLLERS_IMPORT -#if __GNUC__ >= 4 -#define VELOCITY_CONTROLLERS_PUBLIC __attribute__((visibility("default"))) -#define VELOCITY_CONTROLLERS_LOCAL __attribute__((visibility("hidden"))) -#else -#define VELOCITY_CONTROLLERS_PUBLIC -#define VELOCITY_CONTROLLERS_LOCAL -#endif -#define VELOCITY_CONTROLLERS_PUBLIC_TYPE -#endif - -#endif // VELOCITY_CONTROLLERS__VISIBILITY_CONTROL_H_ From a1517f92abdb670863e5318d81e50add1329fcfe Mon Sep 17 00:00:00 2001 From: Bence Magyar Date: Sat, 28 Dec 2024 10:44:09 +0000 Subject: [PATCH 2/3] Remove use of visibility macros --- .../ackermann_steering_controller.hpp | 10 ++---- .../admittance_controller.hpp | 10 ------ .../bicycle_steering_controller.hpp | 10 ++---- .../diff_drive_controller.hpp | 12 ------- .../joint_group_effort_controller.hpp | 4 --- .../force_torque_sensor_broadcaster.hpp | 13 +------ .../forward_command_controller.hpp | 2 -- .../forward_controllers_base.hpp | 10 ------ ...i_interface_forward_command_controller.hpp | 2 -- .../gpio_command_controller.hpp | 9 ----- .../gripper_action_controller.hpp | 11 +----- .../imu_sensor_broadcaster.hpp | 10 +----- .../joint_state_broadcaster.hpp | 9 ----- .../joint_trajectory_controller.hpp | 28 --------------- .../trajectory.hpp | 16 --------- .../mecanum_drive_controller.hpp | 11 ------ .../parallel_gripper_action_controller.hpp | 11 +----- .../include/pid_controller/pid_controller.hpp | 12 ------- .../pose_broadcaster/pose_broadcaster.hpp | 17 ++++----- .../joint_group_position_controller.hpp | 4 +-- .../range_sensor_broadcaster.hpp | 10 +----- .../steering_controllers_library.hpp | 36 ++++++++----------- .../tricycle_controller.hpp | 12 ------- .../tricycle_steering_controller.hpp | 10 ++---- .../joint_group_velocity_controller.hpp | 5 +-- 25 files changed, 37 insertions(+), 247 deletions(-) diff --git a/ackermann_steering_controller/include/ackermann_steering_controller/ackermann_steering_controller.hpp b/ackermann_steering_controller/include/ackermann_steering_controller/ackermann_steering_controller.hpp index 0cb6bcd016..c1eacb40bb 100644 --- a/ackermann_steering_controller/include/ackermann_steering_controller/ackermann_steering_controller.hpp +++ b/ackermann_steering_controller/include/ackermann_steering_controller/ackermann_steering_controller.hpp @@ -20,7 +20,6 @@ #include -#include "ackermann_steering_controller/visibility_control.h" #include "ackermann_steering_controller_parameters.hpp" #include "steering_controllers_library/steering_controllers_library.hpp" @@ -47,14 +46,11 @@ class AckermannSteeringController : public steering_controllers_library::Steerin public: AckermannSteeringController(); - ACKERMANN_STEERING_CONTROLLER__VISIBILITY_PUBLIC controller_interface::CallbackReturn - configure_odometry() override; + controller_interface::CallbackReturn configure_odometry() override; - ACKERMANN_STEERING_CONTROLLER__VISIBILITY_PUBLIC bool update_odometry( - const rclcpp::Duration & period) override; + bool update_odometry(const rclcpp::Duration & period) override; - ACKERMANN_STEERING_CONTROLLER__VISIBILITY_PUBLIC void - initialize_implementation_parameter_listener() override; + void initialize_implementation_parameter_listener() override; protected: std::shared_ptr ackermann_param_listener_; diff --git a/admittance_controller/include/admittance_controller/admittance_controller.hpp b/admittance_controller/include/admittance_controller/admittance_controller.hpp index 17b70b264d..35b072f8d7 100644 --- a/admittance_controller/include/admittance_controller/admittance_controller.hpp +++ b/admittance_controller/include/admittance_controller/admittance_controller.hpp @@ -25,7 +25,6 @@ #include "admittance_controller_parameters.hpp" #include "admittance_controller/admittance_rule.hpp" -#include "admittance_controller/visibility_control.h" #include "control_msgs/msg/admittance_controller_state.hpp" #include "controller_interface/chainable_controller_interface.hpp" #include "hardware_interface/types/hardware_interface_type_values.hpp" @@ -43,7 +42,6 @@ using ControllerStateMsg = control_msgs::msg::AdmittanceControllerState; class AdmittanceController : public controller_interface::ChainableControllerInterface { public: - ADMITTANCE_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_init() override; /// Export configuration of required state interfaces. @@ -51,7 +49,6 @@ class AdmittanceController : public controller_interface::ChainableControllerInt * Allowed types of state interfaces are \ref hardware_interface::POSITION, * \ref hardware_interface::VELOCITY, \ref hardware_interface::ACCELERATION. */ - ADMITTANCE_CONTROLLER_PUBLIC controller_interface::InterfaceConfiguration command_interface_configuration() const override; /// Export configuration of required state interfaces. @@ -59,30 +56,23 @@ class AdmittanceController : public controller_interface::ChainableControllerInt * Allowed types of state interfaces are \ref hardware_interface::POSITION, * \ref hardware_interface::VELOCITY, \ref hardware_interface::ACCELERATION. */ - ADMITTANCE_CONTROLLER_PUBLIC controller_interface::InterfaceConfiguration state_interface_configuration() const override; - ADMITTANCE_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_configure( const rclcpp_lifecycle::State & previous_state) override; - ADMITTANCE_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_activate( const rclcpp_lifecycle::State & previous_state) override; - ADMITTANCE_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_deactivate( const rclcpp_lifecycle::State & previous_state) override; - ADMITTANCE_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_cleanup( const rclcpp_lifecycle::State & previous_state) override; - ADMITTANCE_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_error( const rclcpp_lifecycle::State & previous_state) override; - ADMITTANCE_CONTROLLER_PUBLIC controller_interface::return_type update_and_write_commands( const rclcpp::Time & time, const rclcpp::Duration & period) override; diff --git a/bicycle_steering_controller/include/bicycle_steering_controller/bicycle_steering_controller.hpp b/bicycle_steering_controller/include/bicycle_steering_controller/bicycle_steering_controller.hpp index 1b3e050a37..efb893f2bb 100644 --- a/bicycle_steering_controller/include/bicycle_steering_controller/bicycle_steering_controller.hpp +++ b/bicycle_steering_controller/include/bicycle_steering_controller/bicycle_steering_controller.hpp @@ -20,7 +20,6 @@ #include -#include "bicycle_steering_controller/visibility_control.h" #include "bicycle_steering_controller_parameters.hpp" #include "steering_controllers_library/steering_controllers_library.hpp" @@ -43,14 +42,11 @@ class BicycleSteeringController : public steering_controllers_library::SteeringC public: BicycleSteeringController(); - BICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC controller_interface::CallbackReturn - configure_odometry() override; + controller_interface::CallbackReturn configure_odometry() override; - BICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC bool update_odometry( - const rclcpp::Duration & period) override; + bool update_odometry(const rclcpp::Duration & period) override; - BICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC void initialize_implementation_parameter_listener() - override; + void initialize_implementation_parameter_listener() override; protected: std::shared_ptr bicycle_param_listener_; diff --git a/diff_drive_controller/include/diff_drive_controller/diff_drive_controller.hpp b/diff_drive_controller/include/diff_drive_controller/diff_drive_controller.hpp index 85f4fb23b0..36ba2d6874 100644 --- a/diff_drive_controller/include/diff_drive_controller/diff_drive_controller.hpp +++ b/diff_drive_controller/include/diff_drive_controller/diff_drive_controller.hpp @@ -28,7 +28,6 @@ #include "controller_interface/controller_interface.hpp" #include "diff_drive_controller/odometry.hpp" #include "diff_drive_controller/speed_limiter.hpp" -#include "diff_drive_controller/visibility_control.h" #include "geometry_msgs/msg/twist_stamped.hpp" #include "nav_msgs/msg/odometry.hpp" #include "odometry.hpp" @@ -47,43 +46,32 @@ class DiffDriveController : public controller_interface::ControllerInterface using TwistStamped = geometry_msgs::msg::TwistStamped; public: - DIFF_DRIVE_CONTROLLER_PUBLIC DiffDriveController(); - DIFF_DRIVE_CONTROLLER_PUBLIC controller_interface::InterfaceConfiguration command_interface_configuration() const override; - DIFF_DRIVE_CONTROLLER_PUBLIC controller_interface::InterfaceConfiguration state_interface_configuration() const override; - DIFF_DRIVE_CONTROLLER_PUBLIC controller_interface::return_type update( const rclcpp::Time & time, const rclcpp::Duration & period) override; - DIFF_DRIVE_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_init() override; - DIFF_DRIVE_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_configure( const rclcpp_lifecycle::State & previous_state) override; - DIFF_DRIVE_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_activate( const rclcpp_lifecycle::State & previous_state) override; - DIFF_DRIVE_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_deactivate( const rclcpp_lifecycle::State & previous_state) override; - DIFF_DRIVE_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_cleanup( const rclcpp_lifecycle::State & previous_state) override; - DIFF_DRIVE_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_error( const rclcpp_lifecycle::State & previous_state) override; - DIFF_DRIVE_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_shutdown( const rclcpp_lifecycle::State & previous_state) override; diff --git a/effort_controllers/include/effort_controllers/joint_group_effort_controller.hpp b/effort_controllers/include/effort_controllers/joint_group_effort_controller.hpp index b07e8a630c..2855570cfd 100644 --- a/effort_controllers/include/effort_controllers/joint_group_effort_controller.hpp +++ b/effort_controllers/include/effort_controllers/joint_group_effort_controller.hpp @@ -15,7 +15,6 @@ #ifndef EFFORT_CONTROLLERS__JOINT_GROUP_EFFORT_CONTROLLER_HPP_ #define EFFORT_CONTROLLERS__JOINT_GROUP_EFFORT_CONTROLLER_HPP_ -#include "effort_controllers/visibility_control.h" #include "forward_command_controller/forward_command_controller.hpp" namespace effort_controllers @@ -33,13 +32,10 @@ namespace effort_controllers class JointGroupEffortController : public forward_command_controller::ForwardCommandController { public: - EFFORT_CONTROLLERS_PUBLIC JointGroupEffortController(); - EFFORT_CONTROLLERS_PUBLIC controller_interface::CallbackReturn on_init() override; - EFFORT_CONTROLLERS_PUBLIC controller_interface::CallbackReturn on_deactivate( const rclcpp_lifecycle::State & previous_state) override; }; diff --git a/force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/force_torque_sensor_broadcaster.hpp b/force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/force_torque_sensor_broadcaster.hpp index 2364dd7c8b..0861715678 100644 --- a/force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/force_torque_sensor_broadcaster.hpp +++ b/force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/force_torque_sensor_broadcaster.hpp @@ -23,7 +23,6 @@ #include #include "controller_interface/chainable_controller_interface.hpp" -#include "force_torque_sensor_broadcaster/visibility_control.h" // auto-generated by generate_parameter_library #include "force_torque_sensor_broadcaster_parameters.hpp" #include "geometry_msgs/msg/wrench_stamped.hpp" @@ -36,38 +35,28 @@ namespace force_torque_sensor_broadcaster class ForceTorqueSensorBroadcaster : public controller_interface::ChainableControllerInterface { public: - FORCE_TORQUE_SENSOR_BROADCASTER_PUBLIC ForceTorqueSensorBroadcaster(); - FORCE_TORQUE_SENSOR_BROADCASTER_PUBLIC controller_interface::InterfaceConfiguration command_interface_configuration() const override; - FORCE_TORQUE_SENSOR_BROADCASTER_PUBLIC controller_interface::InterfaceConfiguration state_interface_configuration() const override; + controller_interface::CallbackReturn on_init() override; - FORCE_TORQUE_SENSOR_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_init() override; - - FORCE_TORQUE_SENSOR_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_configure( const rclcpp_lifecycle::State & previous_state) override; - FORCE_TORQUE_SENSOR_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_activate( const rclcpp_lifecycle::State & previous_state) override; - FORCE_TORQUE_SENSOR_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_deactivate( const rclcpp_lifecycle::State & previous_state) override; - FORCE_TORQUE_SENSOR_BROADCASTER_PUBLIC controller_interface::return_type update_and_write_commands( const rclcpp::Time & time, const rclcpp::Duration & period) override; - FORCE_TORQUE_SENSOR_BROADCASTER_PUBLIC controller_interface::return_type update_reference_from_subscribers( const rclcpp::Time & time, const rclcpp::Duration & period) override; - FORCE_TORQUE_SENSOR_BROADCASTER_PUBLIC std::vector on_export_state_interfaces() override; protected: diff --git a/forward_command_controller/include/forward_command_controller/forward_command_controller.hpp b/forward_command_controller/include/forward_command_controller/forward_command_controller.hpp index 12f2a28b22..5401263ec6 100644 --- a/forward_command_controller/include/forward_command_controller/forward_command_controller.hpp +++ b/forward_command_controller/include/forward_command_controller/forward_command_controller.hpp @@ -18,7 +18,6 @@ #include #include "forward_command_controller/forward_controllers_base.hpp" -#include "forward_command_controller/visibility_control.h" // auto-generated by generate_parameter_library #include "forward_command_controller_parameters.hpp" @@ -38,7 +37,6 @@ namespace forward_command_controller class ForwardCommandController : public ForwardControllersBase { public: - FORWARD_COMMAND_CONTROLLER_PUBLIC ForwardCommandController(); protected: diff --git a/forward_command_controller/include/forward_command_controller/forward_controllers_base.hpp b/forward_command_controller/include/forward_command_controller/forward_controllers_base.hpp index fce7941d8a..c8b620d593 100644 --- a/forward_command_controller/include/forward_command_controller/forward_controllers_base.hpp +++ b/forward_command_controller/include/forward_command_controller/forward_controllers_base.hpp @@ -20,7 +20,6 @@ #include #include "controller_interface/controller_interface.hpp" -#include "forward_command_controller/visibility_control.h" #include "rclcpp/subscription.hpp" #include "rclcpp_lifecycle/state.hpp" #include "realtime_tools/realtime_buffer.hpp" @@ -41,34 +40,25 @@ using CmdType = std_msgs::msg::Float64MultiArray; class ForwardControllersBase : public controller_interface::ControllerInterface { public: - FORWARD_COMMAND_CONTROLLER_PUBLIC ForwardControllersBase(); - FORWARD_COMMAND_CONTROLLER_PUBLIC ~ForwardControllersBase() = default; - FORWARD_COMMAND_CONTROLLER_PUBLIC controller_interface::InterfaceConfiguration command_interface_configuration() const override; - FORWARD_COMMAND_CONTROLLER_PUBLIC controller_interface::InterfaceConfiguration state_interface_configuration() const override; - FORWARD_COMMAND_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_init() override; - FORWARD_COMMAND_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_configure( const rclcpp_lifecycle::State & previous_state) override; - FORWARD_COMMAND_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_activate( const rclcpp_lifecycle::State & previous_state) override; - FORWARD_COMMAND_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_deactivate( const rclcpp_lifecycle::State & previous_state) override; - FORWARD_COMMAND_CONTROLLER_PUBLIC controller_interface::return_type update( const rclcpp::Time & time, const rclcpp::Duration & period) override; diff --git a/forward_command_controller/include/forward_command_controller/multi_interface_forward_command_controller.hpp b/forward_command_controller/include/forward_command_controller/multi_interface_forward_command_controller.hpp index 50476c62e3..6ba33be018 100644 --- a/forward_command_controller/include/forward_command_controller/multi_interface_forward_command_controller.hpp +++ b/forward_command_controller/include/forward_command_controller/multi_interface_forward_command_controller.hpp @@ -18,7 +18,6 @@ #include #include "forward_command_controller/forward_controllers_base.hpp" -#include "forward_command_controller/visibility_control.h" #include "multi_interface_forward_command_controller_parameters.hpp" namespace forward_command_controller @@ -38,7 +37,6 @@ class MultiInterfaceForwardCommandController : public forward_command_controller::ForwardControllersBase { public: - FORWARD_COMMAND_CONTROLLER_PUBLIC MultiInterfaceForwardCommandController(); protected: diff --git a/gpio_controllers/include/gpio_controllers/gpio_command_controller.hpp b/gpio_controllers/include/gpio_controllers/gpio_command_controller.hpp index febac1294e..0513d9e1f4 100644 --- a/gpio_controllers/include/gpio_controllers/gpio_command_controller.hpp +++ b/gpio_controllers/include/gpio_controllers/gpio_command_controller.hpp @@ -23,7 +23,6 @@ #include "control_msgs/msg/dynamic_interface_group_values.hpp" #include "controller_interface/controller_interface.hpp" #include "gpio_command_controller_parameters.hpp" -#include "gpio_controllers/visibility_control.h" #include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp" #include "rclcpp_lifecycle/state.hpp" #include "realtime_tools/realtime_buffer.hpp" @@ -45,28 +44,20 @@ using StateInterfaces = class GpioCommandController : public controller_interface::ControllerInterface { public: - GPIO_COMMAND_CONTROLLER_PUBLIC GpioCommandController(); - GPIO_COMMAND_CONTROLLER_PUBLIC controller_interface::InterfaceConfiguration command_interface_configuration() const override; - GPIO_COMMAND_CONTROLLER_PUBLIC controller_interface::InterfaceConfiguration state_interface_configuration() const override; - GPIO_COMMAND_CONTROLLER_PUBLIC CallbackReturn on_init() override; - GPIO_COMMAND_CONTROLLER_PUBLIC CallbackReturn on_configure(const rclcpp_lifecycle::State & previous_state) override; - GPIO_COMMAND_CONTROLLER_PUBLIC CallbackReturn on_activate(const rclcpp_lifecycle::State & previous_state) override; - GPIO_COMMAND_CONTROLLER_PUBLIC CallbackReturn on_deactivate(const rclcpp_lifecycle::State & previous_state) override; - GPIO_COMMAND_CONTROLLER_PUBLIC controller_interface::return_type update( const rclcpp::Time & time, const rclcpp::Duration & period) override; diff --git a/gripper_controllers/include/gripper_controllers/gripper_action_controller.hpp b/gripper_controllers/include/gripper_controllers/gripper_action_controller.hpp index 478168391b..d166d12478 100644 --- a/gripper_controllers/include/gripper_controllers/gripper_action_controller.hpp +++ b/gripper_controllers/include/gripper_controllers/gripper_action_controller.hpp @@ -34,7 +34,6 @@ // ros_controls #include "controller_interface/controller_interface.hpp" -#include "gripper_controllers/visibility_control.hpp" #include "hardware_interface/loaned_command_interface.hpp" #include "hardware_interface/loaned_state_interface.hpp" #include "realtime_tools/realtime_buffer.hpp" @@ -69,39 +68,31 @@ class GripperActionController : public controller_interface::ControllerInterface double position_; // Last commanded position double max_effort_; // Max allowed effort }; - - GRIPPER_ACTION_CONTROLLER_PUBLIC GripperActionController(); + GripperActionController(); /** * @brief command_interface_configuration This controller requires the * position command interfaces for the controlled joints */ - GRIPPER_ACTION_CONTROLLER_PUBLIC controller_interface::InterfaceConfiguration command_interface_configuration() const override; /** * @brief command_interface_configuration This controller requires the * position and velocity state interfaces for the controlled joints */ - GRIPPER_ACTION_CONTROLLER_PUBLIC controller_interface::InterfaceConfiguration state_interface_configuration() const override; - GRIPPER_ACTION_CONTROLLER_PUBLIC controller_interface::return_type update( const rclcpp::Time & time, const rclcpp::Duration & period) override; - GRIPPER_ACTION_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_init() override; - GRIPPER_ACTION_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_configure( const rclcpp_lifecycle::State & previous_state) override; - GRIPPER_ACTION_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_activate( const rclcpp_lifecycle::State & previous_state) override; - GRIPPER_ACTION_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_deactivate( const rclcpp_lifecycle::State & previous_state) override; diff --git a/imu_sensor_broadcaster/include/imu_sensor_broadcaster/imu_sensor_broadcaster.hpp b/imu_sensor_broadcaster/include/imu_sensor_broadcaster/imu_sensor_broadcaster.hpp index 449020b6e2..fda18af83f 100644 --- a/imu_sensor_broadcaster/include/imu_sensor_broadcaster/imu_sensor_broadcaster.hpp +++ b/imu_sensor_broadcaster/include/imu_sensor_broadcaster/imu_sensor_broadcaster.hpp @@ -22,7 +22,6 @@ #include #include "controller_interface/controller_interface.hpp" -#include "imu_sensor_broadcaster/visibility_control.h" // auto-generated by generate_parameter_library #include "imu_sensor_broadcaster_parameters.hpp" #include "rclcpp_lifecycle/state.hpp" @@ -35,27 +34,20 @@ namespace imu_sensor_broadcaster class IMUSensorBroadcaster : public controller_interface::ControllerInterface { public: - IMU_SENSOR_BROADCASTER_PUBLIC controller_interface::InterfaceConfiguration command_interface_configuration() const override; - IMU_SENSOR_BROADCASTER_PUBLIC controller_interface::InterfaceConfiguration state_interface_configuration() const override; + controller_interface::CallbackReturn on_init() override; - IMU_SENSOR_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_init() override; - - IMU_SENSOR_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_configure( const rclcpp_lifecycle::State & previous_state) override; - IMU_SENSOR_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_activate( const rclcpp_lifecycle::State & previous_state) override; - IMU_SENSOR_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_deactivate( const rclcpp_lifecycle::State & previous_state) override; - IMU_SENSOR_BROADCASTER_PUBLIC controller_interface::return_type update( const rclcpp::Time & time, const rclcpp::Duration & period) override; diff --git a/joint_state_broadcaster/include/joint_state_broadcaster/joint_state_broadcaster.hpp b/joint_state_broadcaster/include/joint_state_broadcaster/joint_state_broadcaster.hpp index 7ac98eccfb..da02c5feb8 100644 --- a/joint_state_broadcaster/include/joint_state_broadcaster/joint_state_broadcaster.hpp +++ b/joint_state_broadcaster/include/joint_state_broadcaster/joint_state_broadcaster.hpp @@ -22,7 +22,6 @@ #include "control_msgs/msg/dynamic_joint_state.hpp" #include "controller_interface/controller_interface.hpp" -#include "joint_state_broadcaster/visibility_control.h" // auto-generated by generate_parameter_library #include "joint_state_broadcaster_parameters.hpp" #include "realtime_tools/realtime_publisher.hpp" @@ -58,31 +57,23 @@ namespace joint_state_broadcaster class JointStateBroadcaster : public controller_interface::ControllerInterface { public: - JOINT_STATE_BROADCASTER_PUBLIC JointStateBroadcaster(); - JOINT_STATE_BROADCASTER_PUBLIC controller_interface::InterfaceConfiguration command_interface_configuration() const override; - JOINT_STATE_BROADCASTER_PUBLIC controller_interface::InterfaceConfiguration state_interface_configuration() const override; - JOINT_STATE_BROADCASTER_PUBLIC controller_interface::return_type update( const rclcpp::Time & time, const rclcpp::Duration & period) override; - JOINT_STATE_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_init() override; - JOINT_STATE_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_configure( const rclcpp_lifecycle::State & previous_state) override; - JOINT_STATE_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_activate( const rclcpp_lifecycle::State & previous_state) override; - JOINT_STATE_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_deactivate( const rclcpp_lifecycle::State & previous_state) override; diff --git a/joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp b/joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp index 324ccfe4f1..abefec9d79 100644 --- a/joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp +++ b/joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp @@ -29,7 +29,6 @@ #include "joint_trajectory_controller/interpolation_methods.hpp" #include "joint_trajectory_controller/tolerances.hpp" #include "joint_trajectory_controller/trajectory.hpp" -#include "joint_trajectory_controller/visibility_control.h" #include "rclcpp/duration.hpp" #include "rclcpp/subscription.hpp" #include "rclcpp/time.hpp" @@ -53,49 +52,38 @@ namespace joint_trajectory_controller class JointTrajectoryController : public controller_interface::ControllerInterface { public: - JOINT_TRAJECTORY_CONTROLLER_PUBLIC JointTrajectoryController(); /** * @brief command_interface_configuration */ - JOINT_TRAJECTORY_CONTROLLER_PUBLIC controller_interface::InterfaceConfiguration command_interface_configuration() const override; /** * @brief command_interface_configuration */ - JOINT_TRAJECTORY_CONTROLLER_PUBLIC controller_interface::InterfaceConfiguration state_interface_configuration() const override; - JOINT_TRAJECTORY_CONTROLLER_PUBLIC controller_interface::return_type update( const rclcpp::Time & time, const rclcpp::Duration & period) override; - JOINT_TRAJECTORY_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_init() override; - JOINT_TRAJECTORY_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_configure( const rclcpp_lifecycle::State & previous_state) override; - JOINT_TRAJECTORY_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_activate( const rclcpp_lifecycle::State & previous_state) override; - JOINT_TRAJECTORY_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_deactivate( const rclcpp_lifecycle::State & previous_state) override; - JOINT_TRAJECTORY_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_cleanup( const rclcpp_lifecycle::State & previous_state) override; - JOINT_TRAJECTORY_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_error( const rclcpp_lifecycle::State & previous_state) override; - JOINT_TRAJECTORY_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_shutdown( const rclcpp_lifecycle::State & previous_state) override; @@ -198,17 +186,13 @@ class JointTrajectoryController : public controller_interface::ControllerInterfa rclcpp::Duration action_monitor_period_ = rclcpp::Duration(50ms); // callback for topic interface - JOINT_TRAJECTORY_CONTROLLER_PUBLIC void topic_callback(const std::shared_ptr msg); // callbacks for action_server_ - JOINT_TRAJECTORY_CONTROLLER_PUBLIC rclcpp_action::GoalResponse goal_received_callback( const rclcpp_action::GoalUUID & uuid, std::shared_ptr goal); - JOINT_TRAJECTORY_CONTROLLER_PUBLIC rclcpp_action::CancelResponse goal_cancelled_callback( const std::shared_ptr> goal_handle); - JOINT_TRAJECTORY_CONTROLLER_PUBLIC void goal_accepted_callback( std::shared_ptr> goal_handle); @@ -222,25 +206,19 @@ class JointTrajectoryController : public controller_interface::ControllerInterfa * @param[in] current The current state of the joints. * @param[in] desired The desired state of the joints. */ - JOINT_TRAJECTORY_CONTROLLER_PUBLIC void compute_error_for_joint( JointTrajectoryPoint & error, const size_t index, const JointTrajectoryPoint & current, const JointTrajectoryPoint & desired) const; // fill trajectory_msg so it matches joints controlled by this controller // positions set to current position, velocities, accelerations and efforts to 0.0 - JOINT_TRAJECTORY_CONTROLLER_PUBLIC void fill_partial_goal( std::shared_ptr trajectory_msg) const; // sorts the joints of the incoming message to our local order - JOINT_TRAJECTORY_CONTROLLER_PUBLIC void sort_to_local_joint_order( std::shared_ptr trajectory_msg) const; - JOINT_TRAJECTORY_CONTROLLER_PUBLIC bool validate_trajectory_msg(const trajectory_msgs::msg::JointTrajectory & trajectory) const; - JOINT_TRAJECTORY_CONTROLLER_PUBLIC void add_new_trajectory_msg( const std::shared_ptr & traj_msg); - JOINT_TRAJECTORY_CONTROLLER_PUBLIC bool validate_trajectory_point_field( size_t joint_names_size, const std::vector & vector_field, const std::string & string_for_vector_field, size_t i, bool allow_empty) const; @@ -250,28 +228,22 @@ class JointTrajectoryController : public controller_interface::ControllerInterfa // the tolerances used for the current goal realtime_tools::RealtimeBuffer active_tolerances_; - JOINT_TRAJECTORY_CONTROLLER_PUBLIC void preempt_active_goal(); /** @brief set the current position with zero velocity and acceleration as new command */ - JOINT_TRAJECTORY_CONTROLLER_PUBLIC std::shared_ptr set_hold_position(); /** @brief set last trajectory point to be repeated at success * * no matter if it has nonzero velocity or acceleration */ - JOINT_TRAJECTORY_CONTROLLER_PUBLIC std::shared_ptr set_success_trajectory_point(); - JOINT_TRAJECTORY_CONTROLLER_PUBLIC bool reset(); - JOINT_TRAJECTORY_CONTROLLER_PUBLIC bool has_active_trajectory() const; - JOINT_TRAJECTORY_CONTROLLER_PUBLIC void publish_state( const rclcpp::Time & time, const JointTrajectoryPoint & desired_state, const JointTrajectoryPoint & current_state, const JointTrajectoryPoint & state_error); diff --git a/joint_trajectory_controller/include/joint_trajectory_controller/trajectory.hpp b/joint_trajectory_controller/include/joint_trajectory_controller/trajectory.hpp index 74d4e28f3a..fb699ca7a4 100644 --- a/joint_trajectory_controller/include/joint_trajectory_controller/trajectory.hpp +++ b/joint_trajectory_controller/include/joint_trajectory_controller/trajectory.hpp @@ -19,7 +19,6 @@ #include #include "joint_trajectory_controller/interpolation_methods.hpp" -#include "joint_trajectory_controller/visibility_control.h" #include "rclcpp/time.hpp" #include "trajectory_msgs/msg/joint_trajectory.hpp" #include "trajectory_msgs/msg/joint_trajectory_point.hpp" @@ -32,13 +31,10 @@ using TrajectoryPointConstIter = class Trajectory { public: - JOINT_TRAJECTORY_CONTROLLER_PUBLIC Trajectory(); - JOINT_TRAJECTORY_CONTROLLER_PUBLIC explicit Trajectory(std::shared_ptr joint_trajectory); - JOINT_TRAJECTORY_CONTROLLER_PUBLIC explicit Trajectory( const rclcpp::Time & current_time, const trajectory_msgs::msg::JointTrajectoryPoint & current_point, @@ -52,13 +48,11 @@ class Trajectory * \param joints_angle_wraparound Vector of boolean where true value corresponds to a joint that * wrap around (ie. is continuous). */ - JOINT_TRAJECTORY_CONTROLLER_PUBLIC void set_point_before_trajectory_msg( const rclcpp::Time & current_time, const trajectory_msgs::msg::JointTrajectoryPoint & current_point, const std::vector & joints_angle_wraparound = std::vector()); - JOINT_TRAJECTORY_CONTROLLER_PUBLIC void update(std::shared_ptr joint_trajectory); /// Find the segment (made up of 2 points) and its expected state from the @@ -99,7 +93,6 @@ class Trajectory * \param[in] search_monotonically_increasing If set to true, the next sample call will start * searching in the trajectory at the index of this call's result. */ - JOINT_TRAJECTORY_CONTROLLER_PUBLIC bool sample( const rclcpp::Time & sample_time, const interpolation_methods::InterpolationMethod interpolation_method, @@ -128,34 +121,26 @@ class Trajectory * \param[in] sample_time The time to sample, between time_a and time_b. * \param[out] output The state at \p sample_time. */ - JOINT_TRAJECTORY_CONTROLLER_PUBLIC void interpolate_between_points( const rclcpp::Time & time_a, const trajectory_msgs::msg::JointTrajectoryPoint & state_a, const rclcpp::Time & time_b, const trajectory_msgs::msg::JointTrajectoryPoint & state_b, const rclcpp::Time & sample_time, trajectory_msgs::msg::JointTrajectoryPoint & output); - JOINT_TRAJECTORY_CONTROLLER_PUBLIC TrajectoryPointConstIter begin() const; - JOINT_TRAJECTORY_CONTROLLER_PUBLIC TrajectoryPointConstIter end() const; - JOINT_TRAJECTORY_CONTROLLER_PUBLIC rclcpp::Time time_from_start() const; - JOINT_TRAJECTORY_CONTROLLER_PUBLIC bool has_trajectory_msg() const; - JOINT_TRAJECTORY_CONTROLLER_PUBLIC bool has_nontrivial_msg() const; - JOINT_TRAJECTORY_CONTROLLER_PUBLIC std::shared_ptr get_trajectory_msg() const { return trajectory_msg_; } - JOINT_TRAJECTORY_CONTROLLER_PUBLIC bool is_sampled_already() const { return sampled_already_; } /// Get the index of the segment start returned by the last \p sample() operation. @@ -163,7 +148,6 @@ class Trajectory * As the trajectory is only accessed at monotonically increasing sampling times, this index is * used to speed up the selection of relevant trajectory points. */ - JOINT_TRAJECTORY_CONTROLLER_PUBLIC size_t last_sample_index() const { return last_sample_idx_; } private: diff --git a/mecanum_drive_controller/include/mecanum_drive_controller/mecanum_drive_controller.hpp b/mecanum_drive_controller/include/mecanum_drive_controller/mecanum_drive_controller.hpp index f835752d43..00d28ab4c8 100644 --- a/mecanum_drive_controller/include/mecanum_drive_controller/mecanum_drive_controller.hpp +++ b/mecanum_drive_controller/include/mecanum_drive_controller/mecanum_drive_controller.hpp @@ -25,7 +25,6 @@ #include "controller_interface/chainable_controller_interface.hpp" #include "mecanum_drive_controller/odometry.hpp" -#include "mecanum_drive_controller/visibility_control.h" #include "mecanum_drive_controller_parameters.hpp" #include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp" #include "rclcpp_lifecycle/state.hpp" @@ -51,35 +50,26 @@ static constexpr size_t NR_REF_ITFS = 3; class MecanumDriveController : public controller_interface::ChainableControllerInterface { public: - MECANUM_DRIVE_CONTROLLER__VISIBILITY_PUBLIC MecanumDriveController(); - MECANUM_DRIVE_CONTROLLER__VISIBILITY_PUBLIC controller_interface::CallbackReturn on_init() override; - MECANUM_DRIVE_CONTROLLER__VISIBILITY_PUBLIC controller_interface::InterfaceConfiguration command_interface_configuration() const override; - MECANUM_DRIVE_CONTROLLER__VISIBILITY_PUBLIC controller_interface::InterfaceConfiguration state_interface_configuration() const override; - MECANUM_DRIVE_CONTROLLER__VISIBILITY_PUBLIC controller_interface::CallbackReturn on_configure( const rclcpp_lifecycle::State & previous_state) override; - MECANUM_DRIVE_CONTROLLER__VISIBILITY_PUBLIC controller_interface::CallbackReturn on_activate( const rclcpp_lifecycle::State & previous_state) override; - MECANUM_DRIVE_CONTROLLER__VISIBILITY_PUBLIC controller_interface::CallbackReturn on_deactivate( const rclcpp_lifecycle::State & previous_state) override; - MECANUM_DRIVE_CONTROLLER__VISIBILITY_PUBLIC controller_interface::return_type update_reference_from_subscribers( const rclcpp::Time & time, const rclcpp::Duration & period) override; - MECANUM_DRIVE_CONTROLLER__VISIBILITY_PUBLIC controller_interface::return_type update_and_write_commands( const rclcpp::Time & time, const rclcpp::Duration & period) override; @@ -149,7 +139,6 @@ class MecanumDriveController : public controller_interface::ChainableControllerI private: // callback for topic interface - MECANUM_DRIVE_CONTROLLER__VISIBILITY_LOCAL void reference_callback(const std::shared_ptr msg); double velocity_in_center_frame_linear_x_; // [m/s] diff --git a/parallel_gripper_controller/include/parallel_gripper_controller/parallel_gripper_action_controller.hpp b/parallel_gripper_controller/include/parallel_gripper_controller/parallel_gripper_action_controller.hpp index 739d1c570a..f5f5e97939 100644 --- a/parallel_gripper_controller/include/parallel_gripper_controller/parallel_gripper_action_controller.hpp +++ b/parallel_gripper_controller/include/parallel_gripper_controller/parallel_gripper_action_controller.hpp @@ -36,7 +36,6 @@ #include "controller_interface/controller_interface.hpp" #include "hardware_interface/loaned_command_interface.hpp" #include "hardware_interface/loaned_state_interface.hpp" -#include "parallel_gripper_controller/visibility_control.hpp" #include "realtime_tools/realtime_buffer.hpp" #include "realtime_tools/realtime_server_goal_handle.hpp" @@ -66,39 +65,31 @@ class GripperActionController : public controller_interface::ControllerInterface double max_velocity_; // Desired max gripper velocity double max_effort_; // Desired max allowed effort }; - - GRIPPER_ACTION_CONTROLLER_PUBLIC GripperActionController(); + GripperActionController(); /** * @brief command_interface_configuration This controller requires the * position command interfaces for the controlled joints */ - GRIPPER_ACTION_CONTROLLER_PUBLIC controller_interface::InterfaceConfiguration command_interface_configuration() const override; /** * @brief command_interface_configuration This controller requires the * position and velocity state interfaces for the controlled joints */ - GRIPPER_ACTION_CONTROLLER_PUBLIC controller_interface::InterfaceConfiguration state_interface_configuration() const override; - GRIPPER_ACTION_CONTROLLER_PUBLIC controller_interface::return_type update( const rclcpp::Time & time, const rclcpp::Duration & period) override; - GRIPPER_ACTION_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_init() override; - GRIPPER_ACTION_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_configure( const rclcpp_lifecycle::State & previous_state) override; - GRIPPER_ACTION_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_activate( const rclcpp_lifecycle::State & previous_state) override; - GRIPPER_ACTION_CONTROLLER_PUBLIC controller_interface::CallbackReturn on_deactivate( const rclcpp_lifecycle::State & previous_state) override; diff --git a/pid_controller/include/pid_controller/pid_controller.hpp b/pid_controller/include/pid_controller/pid_controller.hpp index 0aba6cf849..afd5555c0c 100644 --- a/pid_controller/include/pid_controller/pid_controller.hpp +++ b/pid_controller/include/pid_controller/pid_controller.hpp @@ -26,7 +26,6 @@ #include "control_msgs/msg/multi_dof_state_stamped.hpp" #include "control_toolbox/pid_ros.hpp" #include "controller_interface/chainable_controller_interface.hpp" -#include "pid_controller/visibility_control.h" #include "pid_controller_parameters.hpp" #include "rclcpp_lifecycle/state.hpp" #include "realtime_tools/realtime_buffer.hpp" @@ -45,39 +44,29 @@ enum class feedforward_mode_type : std::uint8_t class PidController : public controller_interface::ChainableControllerInterface { public: - PID_CONTROLLER__VISIBILITY_PUBLIC PidController(); - PID_CONTROLLER__VISIBILITY_PUBLIC controller_interface::CallbackReturn on_init() override; - PID_CONTROLLER__VISIBILITY_PUBLIC controller_interface::InterfaceConfiguration command_interface_configuration() const override; - PID_CONTROLLER__VISIBILITY_PUBLIC controller_interface::InterfaceConfiguration state_interface_configuration() const override; - PID_CONTROLLER__VISIBILITY_PUBLIC controller_interface::CallbackReturn on_cleanup( const rclcpp_lifecycle::State & previous_state) override; - PID_CONTROLLER__VISIBILITY_PUBLIC controller_interface::CallbackReturn on_configure( const rclcpp_lifecycle::State & previous_state) override; - PID_CONTROLLER__VISIBILITY_PUBLIC controller_interface::CallbackReturn on_activate( const rclcpp_lifecycle::State & previous_state) override; - PID_CONTROLLER__VISIBILITY_PUBLIC controller_interface::CallbackReturn on_deactivate( const rclcpp_lifecycle::State & previous_state) override; - PID_CONTROLLER__VISIBILITY_PUBLIC controller_interface::return_type update_reference_from_subscribers( const rclcpp::Time & time, const rclcpp::Duration & period) override; - PID_CONTROLLER__VISIBILITY_PUBLIC controller_interface::return_type update_and_write_commands( const rclcpp::Time & time, const rclcpp::Duration & period) override; @@ -127,7 +116,6 @@ class PidController : public controller_interface::ChainableControllerInterface private: // callback for topic interface - PID_CONTROLLER__VISIBILITY_LOCAL void reference_callback(const std::shared_ptr msg); }; diff --git a/pose_broadcaster/include/pose_broadcaster/pose_broadcaster.hpp b/pose_broadcaster/include/pose_broadcaster/pose_broadcaster.hpp index 9317fce5e1..024aa41602 100644 --- a/pose_broadcaster/include/pose_broadcaster/pose_broadcaster.hpp +++ b/pose_broadcaster/include/pose_broadcaster/pose_broadcaster.hpp @@ -21,7 +21,6 @@ #include "controller_interface/controller_interface.hpp" #include "geometry_msgs/msg/pose_stamped.hpp" -#include "pose_broadcaster/visibility_control.h" #include "pose_broadcaster_parameters.hpp" #include "rclcpp/publisher.hpp" #include "rclcpp_lifecycle/state.hpp" @@ -35,24 +34,22 @@ namespace pose_broadcaster class PoseBroadcaster : public controller_interface::ControllerInterface { public: - POSE_BROADCASTER_PUBLIC controller_interface::InterfaceConfiguration - command_interface_configuration() const override; + controller_interface::InterfaceConfiguration command_interface_configuration() const override; - POSE_BROADCASTER_PUBLIC controller_interface::InterfaceConfiguration - state_interface_configuration() const override; + controller_interface::InterfaceConfiguration state_interface_configuration() const override; - POSE_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_init() override; + controller_interface::CallbackReturn on_init() override; - POSE_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_configure( + controller_interface::CallbackReturn on_configure( const rclcpp_lifecycle::State & previous_state) override; - POSE_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_activate( + controller_interface::CallbackReturn on_activate( const rclcpp_lifecycle::State & previous_state) override; - POSE_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_deactivate( + controller_interface::CallbackReturn on_deactivate( const rclcpp_lifecycle::State & previous_state) override; - POSE_BROADCASTER_PUBLIC controller_interface::return_type update( + controller_interface::return_type update( const rclcpp::Time & time, const rclcpp::Duration & period) override; private: diff --git a/position_controllers/include/position_controllers/joint_group_position_controller.hpp b/position_controllers/include/position_controllers/joint_group_position_controller.hpp index 4eaf9086e4..ceaf7639ed 100644 --- a/position_controllers/include/position_controllers/joint_group_position_controller.hpp +++ b/position_controllers/include/position_controllers/joint_group_position_controller.hpp @@ -16,7 +16,6 @@ #define POSITION_CONTROLLERS__JOINT_GROUP_POSITION_CONTROLLER_HPP_ #include "forward_command_controller/forward_command_controller.hpp" -#include "position_controllers/visibility_control.h" namespace position_controllers { @@ -33,10 +32,9 @@ namespace position_controllers class JointGroupPositionController : public forward_command_controller::ForwardCommandController { public: - POSITION_CONTROLLERS_PUBLIC JointGroupPositionController(); - POSITION_CONTROLLERS_PUBLIC controller_interface::CallbackReturn on_init() override; + controller_interface::CallbackReturn on_init() override; }; } // namespace position_controllers diff --git a/range_sensor_broadcaster/include/range_sensor_broadcaster/range_sensor_broadcaster.hpp b/range_sensor_broadcaster/include/range_sensor_broadcaster/range_sensor_broadcaster.hpp index 2e4e47b018..f1e2c8e72f 100644 --- a/range_sensor_broadcaster/include/range_sensor_broadcaster/range_sensor_broadcaster.hpp +++ b/range_sensor_broadcaster/include/range_sensor_broadcaster/range_sensor_broadcaster.hpp @@ -22,7 +22,6 @@ #include #include "controller_interface/controller_interface.hpp" -#include "range_sensor_broadcaster/visibility_control.h" #include "range_sensor_broadcaster_parameters.hpp" #include "rclcpp_lifecycle/state.hpp" #include "realtime_tools/realtime_publisher.hpp" @@ -34,27 +33,20 @@ namespace range_sensor_broadcaster class RangeSensorBroadcaster : public controller_interface::ControllerInterface { public: - RANGE_SENSOR_BROADCASTER_PUBLIC controller_interface::InterfaceConfiguration command_interface_configuration() const override; - RANGE_SENSOR_BROADCASTER_PUBLIC controller_interface::InterfaceConfiguration state_interface_configuration() const override; + controller_interface::CallbackReturn on_init() override; - RANGE_SENSOR_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_init() override; - - RANGE_SENSOR_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_configure( const rclcpp_lifecycle::State & previous_state) override; - RANGE_SENSOR_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_activate( const rclcpp_lifecycle::State & previous_state) override; - RANGE_SENSOR_BROADCASTER_PUBLIC controller_interface::CallbackReturn on_deactivate( const rclcpp_lifecycle::State & previous_state) override; - RANGE_SENSOR_BROADCASTER_PUBLIC controller_interface::return_type update( const rclcpp::Time & time, const rclcpp::Duration & period) override; diff --git a/steering_controllers_library/include/steering_controllers_library/steering_controllers_library.hpp b/steering_controllers_library/include/steering_controllers_library/steering_controllers_library.hpp index 49236986ee..e3a415c374 100644 --- a/steering_controllers_library/include/steering_controllers_library/steering_controllers_library.hpp +++ b/steering_controllers_library/include/steering_controllers_library/steering_controllers_library.hpp @@ -26,7 +26,6 @@ #include "realtime_tools/realtime_buffer.hpp" #include "realtime_tools/realtime_publisher.hpp" #include "steering_controllers_library/steering_odometry.hpp" -#include "steering_controllers_library/visibility_control.h" #include "steering_controllers_library_parameters.hpp" // TODO(anyone): Replace with controller specific messages @@ -41,40 +40,34 @@ namespace steering_controllers_library class SteeringControllersLibrary : public controller_interface::ChainableControllerInterface { public: - STEERING_CONTROLLERS__VISIBILITY_PUBLIC SteeringControllersLibrary(); + SteeringControllersLibrary(); - virtual STEERING_CONTROLLERS__VISIBILITY_PUBLIC void - initialize_implementation_parameter_listener() = 0; + virtual void initialize_implementation_parameter_listener() = 0; - STEERING_CONTROLLERS__VISIBILITY_PUBLIC controller_interface::CallbackReturn on_init() override; + controller_interface::CallbackReturn on_init() override; - STEERING_CONTROLLERS__VISIBILITY_PUBLIC controller_interface::InterfaceConfiguration - command_interface_configuration() const override; + controller_interface::InterfaceConfiguration command_interface_configuration() const override; - STEERING_CONTROLLERS__VISIBILITY_PUBLIC controller_interface::InterfaceConfiguration - state_interface_configuration() const override; + controller_interface::InterfaceConfiguration state_interface_configuration() const override; - virtual STEERING_CONTROLLERS__VISIBILITY_PUBLIC controller_interface::CallbackReturn - configure_odometry() = 0; + virtual controller_interface::CallbackReturn configure_odometry() = 0; - virtual STEERING_CONTROLLERS__VISIBILITY_PUBLIC bool update_odometry( - const rclcpp::Duration & period) = 0; + virtual bool update_odometry(const rclcpp::Duration & period) = 0; - STEERING_CONTROLLERS__VISIBILITY_PUBLIC controller_interface::CallbackReturn on_configure( + controller_interface::CallbackReturn on_configure( const rclcpp_lifecycle::State & previous_state) override; - STEERING_CONTROLLERS__VISIBILITY_PUBLIC controller_interface::CallbackReturn on_activate( + controller_interface::CallbackReturn on_activate( const rclcpp_lifecycle::State & previous_state) override; - STEERING_CONTROLLERS__VISIBILITY_PUBLIC controller_interface::CallbackReturn on_deactivate( + controller_interface::CallbackReturn on_deactivate( const rclcpp_lifecycle::State & previous_state) override; - STEERING_CONTROLLERS__VISIBILITY_PUBLIC controller_interface::return_type - update_reference_from_subscribers( + controller_interface::return_type update_reference_from_subscribers( const rclcpp::Time & time, const rclcpp::Duration & period) override; - STEERING_CONTROLLERS__VISIBILITY_PUBLIC controller_interface::return_type - update_and_write_commands(const rclcpp::Time & time, const rclcpp::Duration & period) override; + controller_interface::return_type update_and_write_commands( + const rclcpp::Time & time, const rclcpp::Duration & period) override; using ControllerAckermannReferenceMsg = ackermann_msgs::msg::AckermannDriveStamped; using ControllerTwistReferenceMsg = geometry_msgs::msg::TwistStamped; @@ -134,8 +127,7 @@ class SteeringControllersLibrary : public controller_interface::ChainableControl private: // callback for topic interface - STEERING_CONTROLLERS__VISIBILITY_LOCAL void reference_callback( - const std::shared_ptr msg); + void reference_callback(const std::shared_ptr msg); }; } // namespace steering_controllers_library diff --git a/tricycle_controller/include/tricycle_controller/tricycle_controller.hpp b/tricycle_controller/include/tricycle_controller/tricycle_controller.hpp index 4d64549613..86793fd435 100644 --- a/tricycle_controller/include/tricycle_controller/tricycle_controller.hpp +++ b/tricycle_controller/include/tricycle_controller/tricycle_controller.hpp @@ -40,7 +40,6 @@ #include "tricycle_controller/odometry.hpp" #include "tricycle_controller/steering_limiter.hpp" #include "tricycle_controller/traction_limiter.hpp" -#include "tricycle_controller/visibility_control.h" // auto-generated by generate_parameter_library #include "tricycle_controller_parameters.hpp" @@ -56,38 +55,27 @@ class TricycleController : public controller_interface::ControllerInterface using AckermannDrive = ackermann_msgs::msg::AckermannDrive; public: - TRICYCLE_CONTROLLER_PUBLIC TricycleController(); - TRICYCLE_CONTROLLER_PUBLIC controller_interface::InterfaceConfiguration command_interface_configuration() const override; - TRICYCLE_CONTROLLER_PUBLIC controller_interface::InterfaceConfiguration state_interface_configuration() const override; - TRICYCLE_CONTROLLER_PUBLIC controller_interface::return_type update( const rclcpp::Time & time, const rclcpp::Duration & period) override; - TRICYCLE_CONTROLLER_PUBLIC CallbackReturn on_init() override; - TRICYCLE_CONTROLLER_PUBLIC CallbackReturn on_configure(const rclcpp_lifecycle::State & previous_state) override; - TRICYCLE_CONTROLLER_PUBLIC CallbackReturn on_activate(const rclcpp_lifecycle::State & previous_state) override; - TRICYCLE_CONTROLLER_PUBLIC CallbackReturn on_deactivate(const rclcpp_lifecycle::State & previous_state) override; - TRICYCLE_CONTROLLER_PUBLIC CallbackReturn on_cleanup(const rclcpp_lifecycle::State & previous_state) override; - TRICYCLE_CONTROLLER_PUBLIC CallbackReturn on_error(const rclcpp_lifecycle::State & previous_state) override; - TRICYCLE_CONTROLLER_PUBLIC CallbackReturn on_shutdown(const rclcpp_lifecycle::State & previous_state) override; protected: diff --git a/tricycle_steering_controller/include/tricycle_steering_controller/tricycle_steering_controller.hpp b/tricycle_steering_controller/include/tricycle_steering_controller/tricycle_steering_controller.hpp index 559de6a223..28e477a578 100644 --- a/tricycle_steering_controller/include/tricycle_steering_controller/tricycle_steering_controller.hpp +++ b/tricycle_steering_controller/include/tricycle_steering_controller/tricycle_steering_controller.hpp @@ -21,7 +21,6 @@ #include #include "steering_controllers_library/steering_controllers_library.hpp" -#include "tricycle_steering_controller/visibility_control.h" #include "tricycle_steering_controller_parameters.hpp" namespace tricycle_steering_controller @@ -45,14 +44,11 @@ class TricycleSteeringController : public steering_controllers_library::Steering public: TricycleSteeringController(); - TRICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC controller_interface::CallbackReturn - configure_odometry() override; + controller_interface::CallbackReturn configure_odometry() override; - TRICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC bool update_odometry( - const rclcpp::Duration & period) override; + bool update_odometry(const rclcpp::Duration & period) override; - TRICYCLE_STEERING_CONTROLLER__VISIBILITY_PUBLIC void - initialize_implementation_parameter_listener() override; + void initialize_implementation_parameter_listener() override; protected: std::shared_ptr tricycle_param_listener_; diff --git a/velocity_controllers/include/velocity_controllers/joint_group_velocity_controller.hpp b/velocity_controllers/include/velocity_controllers/joint_group_velocity_controller.hpp index e443ba76cc..4cb0f338ea 100644 --- a/velocity_controllers/include/velocity_controllers/joint_group_velocity_controller.hpp +++ b/velocity_controllers/include/velocity_controllers/joint_group_velocity_controller.hpp @@ -16,7 +16,6 @@ #define VELOCITY_CONTROLLERS__JOINT_GROUP_VELOCITY_CONTROLLER_HPP_ #include "forward_command_controller/forward_command_controller.hpp" -#include "velocity_controllers/visibility_control.h" namespace velocity_controllers { @@ -33,12 +32,10 @@ namespace velocity_controllers class JointGroupVelocityController : public forward_command_controller::ForwardCommandController { public: - VELOCITY_CONTROLLERS_PUBLIC JointGroupVelocityController(); - VELOCITY_CONTROLLERS_PUBLIC controller_interface::CallbackReturn on_init() override; + controller_interface::CallbackReturn on_init() override; - VELOCITY_CONTROLLERS_PUBLIC controller_interface::CallbackReturn on_deactivate( const rclcpp_lifecycle::State & previous_state) override; }; From da014e9be463bef4ff7ee7581c3fe65b5a8d6820 Mon Sep 17 00:00:00 2001 From: Bence Magyar Date: Sun, 29 Dec 2024 10:09:18 +0000 Subject: [PATCH 3/3] Swap around cmake defines --- ackermann_steering_controller/CMakeLists.txt | 10 +++++----- admittance_controller/CMakeLists.txt | 10 +++++----- bicycle_steering_controller/CMakeLists.txt | 10 +++++----- diff_drive_controller/CMakeLists.txt | 9 +++++---- effort_controllers/CMakeLists.txt | 9 +++++---- force_torque_sensor_broadcaster/CMakeLists.txt | 10 +++++----- forward_command_controller/CMakeLists.txt | 10 +++++----- gpio_controllers/CMakeLists.txt | 13 ++++--------- gripper_controllers/CMakeLists.txt | 6 +----- imu_sensor_broadcaster/CMakeLists.txt | 10 +++++----- joint_state_broadcaster/CMakeLists.txt | 9 +++++---- joint_trajectory_controller/CMakeLists.txt | 9 +++++---- mecanum_drive_controller/CMakeLists.txt | 10 +++++----- parallel_gripper_controller/CMakeLists.txt | 2 +- pid_controller/CMakeLists.txt | 10 +++++----- pose_broadcaster/CMakeLists.txt | 13 +++++-------- position_controllers/CMakeLists.txt | 9 +++++---- range_sensor_broadcaster/CMakeLists.txt | 7 ++++--- steering_controllers_library/CMakeLists.txt | 10 +++++----- tricycle_controller/CMakeLists.txt | 9 +++++---- tricycle_steering_controller/CMakeLists.txt | 10 +++++----- velocity_controllers/CMakeLists.txt | 10 +++++----- 22 files changed, 100 insertions(+), 105 deletions(-) diff --git a/ackermann_steering_controller/CMakeLists.txt b/ackermann_steering_controller/CMakeLists.txt index 2ffc413633..2f160fd4c5 100644 --- a/ackermann_steering_controller/CMakeLists.txt +++ b/ackermann_steering_controller/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(ackermann_steering_controller LANGUAGES CXX) +project(ackermann_steering_controller) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable @@ -7,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + # find dependencies set(THIS_PACKAGE_INCLUDE_DEPENDS controller_interface @@ -45,10 +49,6 @@ target_link_libraries(ackermann_steering_controller PUBLIC ackermann_steering_controller_parameters) ament_target_dependencies(ackermann_steering_controller PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(ackermann_steering_controller PRIVATE "ACKERMANN_STEERING_CONTROLLER__VISIBILITY_BUILDING_DLL") - pluginlib_export_plugin_description_file( controller_interface ackermann_steering_controller.xml) diff --git a/admittance_controller/CMakeLists.txt b/admittance_controller/CMakeLists.txt index 477a343776..a068239c17 100644 --- a/admittance_controller/CMakeLists.txt +++ b/admittance_controller/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(admittance_controller LANGUAGES CXX) +project(admittance_controller) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable @@ -7,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + set(THIS_PACKAGE_INCLUDE_DEPENDS angles control_msgs @@ -54,10 +58,6 @@ target_link_libraries(admittance_controller PUBLIC ) ament_target_dependencies(admittance_controller PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(admittance_controller PRIVATE "ADMITTANCE_CONTROLLER_BUILDING_DLL") - pluginlib_export_plugin_description_file(controller_interface admittance_controller.xml) if(BUILD_TESTING) diff --git a/bicycle_steering_controller/CMakeLists.txt b/bicycle_steering_controller/CMakeLists.txt index 1f3a4599cc..2e88e9e70a 100644 --- a/bicycle_steering_controller/CMakeLists.txt +++ b/bicycle_steering_controller/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(bicycle_steering_controller LANGUAGES CXX) +project(bicycle_steering_controller) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable @@ -7,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + # find dependencies set(THIS_PACKAGE_INCLUDE_DEPENDS controller_interface @@ -45,10 +49,6 @@ target_link_libraries(bicycle_steering_controller PUBLIC bicycle_steering_controller_parameters) ament_target_dependencies(bicycle_steering_controller PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(bicycle_steering_controller PRIVATE "BICYCLE_STEERING_CONTROLLER__VISIBILITY_BUILDING_DLL") - pluginlib_export_plugin_description_file( controller_interface bicycle_steering_controller.xml) diff --git a/diff_drive_controller/CMakeLists.txt b/diff_drive_controller/CMakeLists.txt index d94b6e3ce0..c5f4ade8a6 100644 --- a/diff_drive_controller/CMakeLists.txt +++ b/diff_drive_controller/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(diff_drive_controller LANGUAGES CXX) +project(diff_drive_controller) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Werror=conversion -Werror=unused-but-set-variable @@ -7,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + set(THIS_PACKAGE_INCLUDE_DEPENDS control_toolbox controller_interface @@ -49,9 +53,6 @@ target_link_libraries(diff_drive_controller PUBLIC diff_drive_controller_parameters) ament_target_dependencies(diff_drive_controller PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(diff_drive_controller PRIVATE "DIFF_DRIVE_CONTROLLER_BUILDING_DLL") pluginlib_export_plugin_description_file(controller_interface diff_drive_plugin.xml) if(BUILD_TESTING) diff --git a/effort_controllers/CMakeLists.txt b/effort_controllers/CMakeLists.txt index e79015fbbf..60cce95e28 100644 --- a/effort_controllers/CMakeLists.txt +++ b/effort_controllers/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(effort_controllers LANGUAGES CXX) +project(effort_controllers) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable @@ -7,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + set(THIS_PACKAGE_INCLUDE_DEPENDS forward_command_controller pluginlib @@ -29,9 +33,6 @@ target_include_directories(effort_controllers PUBLIC ) ament_target_dependencies(effort_controllers PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(effort_controllers PRIVATE "EFFORT_CONTROLLERS_BUILDING_DLL") pluginlib_export_plugin_description_file(controller_interface effort_controllers_plugins.xml) if(BUILD_TESTING) diff --git a/force_torque_sensor_broadcaster/CMakeLists.txt b/force_torque_sensor_broadcaster/CMakeLists.txt index d9b005e650..be54c3bd58 100644 --- a/force_torque_sensor_broadcaster/CMakeLists.txt +++ b/force_torque_sensor_broadcaster/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(force_torque_sensor_broadcaster LANGUAGES CXX) +project(force_torque_sensor_broadcaster) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable @@ -7,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + set(THIS_PACKAGE_INCLUDE_DEPENDS controller_interface generate_parameter_library @@ -41,10 +45,6 @@ target_link_libraries(force_torque_sensor_broadcaster PUBLIC ) ament_target_dependencies(force_torque_sensor_broadcaster PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(force_torque_sensor_broadcaster PRIVATE "FORCE_TORQUE_SENSOR_BROADCASTER_BUILDING_DLL") - pluginlib_export_plugin_description_file( controller_interface force_torque_sensor_broadcaster.xml) diff --git a/forward_command_controller/CMakeLists.txt b/forward_command_controller/CMakeLists.txt index bf027866d6..f7610c5f85 100644 --- a/forward_command_controller/CMakeLists.txt +++ b/forward_command_controller/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(forward_command_controller LANGUAGES CXX) +project(forward_command_controller) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable @@ -7,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + set(THIS_PACKAGE_INCLUDE_DEPENDS controller_interface generate_parameter_library @@ -48,12 +52,8 @@ target_link_libraries(forward_command_controller PUBLIC multi_interface_forward_command_controller_parameters ) ament_target_dependencies(forward_command_controller PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(forward_command_controller PRIVATE "FORWARD_COMMAND_CONTROLLER_BUILDING_DLL") pluginlib_export_plugin_description_file(controller_interface forward_command_plugin.xml) - if(BUILD_TESTING) find_package(ament_cmake_gmock REQUIRED) find_package(controller_manager REQUIRED) diff --git a/gpio_controllers/CMakeLists.txt b/gpio_controllers/CMakeLists.txt index 6ea97e04ca..62274b0cf9 100644 --- a/gpio_controllers/CMakeLists.txt +++ b/gpio_controllers/CMakeLists.txt @@ -1,17 +1,16 @@ cmake_minimum_required(VERSION 3.8) project(gpio_controllers) -# Default to C++14 -if(NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 14) -endif() - if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable -Werror=return-type -Werror=shadow -Werror=format -Werror=range-loop-construct -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + # find dependencies find_package(ament_cmake REQUIRED) find_package(controller_interface REQUIRED) @@ -23,7 +22,6 @@ find_package(realtime_tools REQUIRED) find_package(generate_parameter_library REQUIRED) find_package(control_msgs REQUIRED) - generate_parameter_library(gpio_command_controller_parameters src/gpio_command_controller_parameters.yaml ) @@ -44,9 +42,6 @@ ament_target_dependencies(gpio_controllers PUBLIC realtime_tools control_msgs ) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(gpio_controllers PRIVATE "GPIO_COMMAND_CONTROLLER_BUILDING_DLL") pluginlib_export_plugin_description_file(controller_interface gpio_controllers_plugin.xml) install( diff --git a/gripper_controllers/CMakeLists.txt b/gripper_controllers/CMakeLists.txt index 4e9c72f79b..4ffdc76168 100644 --- a/gripper_controllers/CMakeLists.txt +++ b/gripper_controllers/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(gripper_controllers LANGUAGES CXX) +project(gripper_controllers) if(APPLE OR WIN32) message(WARNING "gripper controllers are not available on OSX or Windows") @@ -47,10 +47,6 @@ target_link_libraries(gripper_action_controller PUBLIC ) ament_target_dependencies(gripper_action_controller PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(gripper_action_controller PRIVATE "GRIPPER_ACTION_CONTROLLER_BUILDING_DLL") - pluginlib_export_plugin_description_file(controller_interface ros_control_plugins.xml) if(BUILD_TESTING) diff --git a/imu_sensor_broadcaster/CMakeLists.txt b/imu_sensor_broadcaster/CMakeLists.txt index 38f0adbb54..7b12c9095e 100644 --- a/imu_sensor_broadcaster/CMakeLists.txt +++ b/imu_sensor_broadcaster/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(imu_sensor_broadcaster LANGUAGES CXX) +project(imu_sensor_broadcaster) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable @@ -7,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + set(THIS_PACKAGE_INCLUDE_DEPENDS controller_interface generate_parameter_library @@ -41,10 +45,6 @@ target_link_libraries(imu_sensor_broadcaster PUBLIC ) ament_target_dependencies(imu_sensor_broadcaster PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(imu_sensor_broadcaster PRIVATE "IMU_SENSOR_BROADCASTER_BUILDING_DLL") - pluginlib_export_plugin_description_file( controller_interface imu_sensor_broadcaster.xml) diff --git a/joint_state_broadcaster/CMakeLists.txt b/joint_state_broadcaster/CMakeLists.txt index a75bbfa8f9..adbd5254e1 100644 --- a/joint_state_broadcaster/CMakeLists.txt +++ b/joint_state_broadcaster/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(joint_state_broadcaster LANGUAGES CXX) +project(joint_state_broadcaster) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable @@ -7,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + set(THIS_PACKAGE_INCLUDE_DEPENDS builtin_interfaces control_msgs @@ -42,9 +46,6 @@ target_link_libraries(joint_state_broadcaster PUBLIC joint_state_broadcaster_parameters ) ament_target_dependencies(joint_state_broadcaster PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(joint_state_broadcaster PRIVATE "JOINT_STATE_BROADCASTER_BUILDING_DLL") pluginlib_export_plugin_description_file(controller_interface joint_state_plugin.xml) if(BUILD_TESTING) diff --git a/joint_trajectory_controller/CMakeLists.txt b/joint_trajectory_controller/CMakeLists.txt index ec142c72f3..37e68b08c9 100644 --- a/joint_trajectory_controller/CMakeLists.txt +++ b/joint_trajectory_controller/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(joint_trajectory_controller LANGUAGES CXX) +project(joint_trajectory_controller) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable @@ -7,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + set(THIS_PACKAGE_INCLUDE_DEPENDS angles control_msgs @@ -49,9 +53,6 @@ target_link_libraries(joint_trajectory_controller PUBLIC ) ament_target_dependencies(joint_trajectory_controller PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(joint_trajectory_controller PRIVATE "JOINT_TRAJECTORY_CONTROLLER_BUILDING_DLL" "_USE_MATH_DEFINES") pluginlib_export_plugin_description_file(controller_interface joint_trajectory_plugin.xml) if(BUILD_TESTING) diff --git a/mecanum_drive_controller/CMakeLists.txt b/mecanum_drive_controller/CMakeLists.txt index 48bac58fe7..095e910dee 100644 --- a/mecanum_drive_controller/CMakeLists.txt +++ b/mecanum_drive_controller/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(mecanum_drive_controller LANGUAGES CXX) +project(mecanum_drive_controller) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable @@ -7,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + # find dependencies set(THIS_PACKAGE_INCLUDE_DEPENDS controller_interface @@ -47,10 +51,6 @@ target_link_libraries(mecanum_drive_controller PUBLIC mecanum_drive_controller_parameters) ament_target_dependencies(mecanum_drive_controller PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(mecanum_drive_controller PRIVATE "ACKERMANN_STEERING_CONTROLLER_BUILDING_DLL") - pluginlib_export_plugin_description_file( controller_interface mecanum_drive_controller.xml) diff --git a/parallel_gripper_controller/CMakeLists.txt b/parallel_gripper_controller/CMakeLists.txt index 3d9be8dfac..8c1018895d 100644 --- a/parallel_gripper_controller/CMakeLists.txt +++ b/parallel_gripper_controller/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(parallel_gripper_controller LANGUAGES CXX) +project(parallel_gripper_controller) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable diff --git a/pid_controller/CMakeLists.txt b/pid_controller/CMakeLists.txt index ed9bdcd8cf..d1374d54cb 100644 --- a/pid_controller/CMakeLists.txt +++ b/pid_controller/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(pid_controller LANGUAGES CXX) +project(pid_controller) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable @@ -7,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + if(WIN32) add_compile_definitions( # For math constants @@ -55,10 +59,6 @@ target_link_libraries(pid_controller PUBLIC ) ament_target_dependencies(pid_controller PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(pid_controller PRIVATE "PID_CONTROLLER__VISIBILITY_BUILDING_DLL") - pluginlib_export_plugin_description_file(controller_interface pid_controller.xml) if(BUILD_TESTING) diff --git a/pose_broadcaster/CMakeLists.txt b/pose_broadcaster/CMakeLists.txt index 3cc434d2d0..2375779e33 100644 --- a/pose_broadcaster/CMakeLists.txt +++ b/pose_broadcaster/CMakeLists.txt @@ -1,8 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(pose_broadcaster - LANGUAGES - CXX -) +project(pose_broadcaster) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable @@ -10,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + set(THIS_PACKAGE_INCLUDE_DEPENDS controller_interface generate_parameter_library @@ -49,10 +50,6 @@ ament_target_dependencies(pose_broadcaster PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS} ) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(pose_broadcaster PRIVATE "POSE_BROADCASTER_BUILDING_DLL") - pluginlib_export_plugin_description_file( controller_interface pose_broadcaster.xml ) diff --git a/position_controllers/CMakeLists.txt b/position_controllers/CMakeLists.txt index e76b76555e..71ffd0eeba 100644 --- a/position_controllers/CMakeLists.txt +++ b/position_controllers/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(position_controllers LANGUAGES CXX) +project(position_controllers) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable @@ -7,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + set(THIS_PACKAGE_INCLUDE_DEPENDS forward_command_controller pluginlib @@ -29,9 +33,6 @@ target_include_directories(position_controllers PUBLIC ) ament_target_dependencies(position_controllers PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(position_controllers PRIVATE "POSITION_CONTROLLERS_BUILDING_DLL") pluginlib_export_plugin_description_file(controller_interface position_controllers_plugins.xml) if(BUILD_TESTING) diff --git a/range_sensor_broadcaster/CMakeLists.txt b/range_sensor_broadcaster/CMakeLists.txt index d70614ea53..744611bb65 100644 --- a/range_sensor_broadcaster/CMakeLists.txt +++ b/range_sensor_broadcaster/CMakeLists.txt @@ -13,6 +13,10 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + set(THIS_PACKAGE_INCLUDE_DEPENDS controller_interface generate_parameter_library @@ -45,9 +49,6 @@ target_include_directories(range_sensor_broadcaster PRIVATE $ ) ament_target_dependencies(range_sensor_broadcaster ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(range_sensor_broadcaster PRIVATE "RANGE_SENSOR_BROADCASTER_BUILDING_DLL") target_link_libraries(range_sensor_broadcaster range_sensor_broadcaster_parameters ) diff --git a/steering_controllers_library/CMakeLists.txt b/steering_controllers_library/CMakeLists.txt index fc79d54b7c..2e80ed198f 100644 --- a/steering_controllers_library/CMakeLists.txt +++ b/steering_controllers_library/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(steering_controllers_library LANGUAGES CXX) +project(steering_controllers_library) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable @@ -7,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + # find dependencies set(THIS_PACKAGE_INCLUDE_DEPENDS control_msgs @@ -52,10 +56,6 @@ target_link_libraries(steering_controllers_library PUBLIC steering_controllers_library_parameters) ament_target_dependencies(steering_controllers_library PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(steering_controllers_library PRIVATE "STEERING_CONTROLLERS__VISIBILITY_BUILDING_DLL" "_USE_MATH_DEFINES") - if(BUILD_TESTING) find_package(ament_cmake_gmock REQUIRED) find_package(controller_manager REQUIRED) diff --git a/tricycle_controller/CMakeLists.txt b/tricycle_controller/CMakeLists.txt index ee877272ab..b5669530dc 100644 --- a/tricycle_controller/CMakeLists.txt +++ b/tricycle_controller/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(tricycle_controller LANGUAGES CXX) +project(tricycle_controller) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable @@ -7,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + set(THIS_PACKAGE_INCLUDE_DEPENDS ackermann_msgs builtin_interfaces @@ -50,9 +54,6 @@ target_include_directories(tricycle_controller PUBLIC ) target_link_libraries(tricycle_controller PUBLIC tricycle_controller_parameters) ament_target_dependencies(tricycle_controller PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(tricycle_controller PRIVATE "TRICYCLE_CONTROLLER_BUILDING_DLL" "_USE_MATH_DEFINES") pluginlib_export_plugin_description_file(controller_interface tricycle_controller.xml) diff --git a/tricycle_steering_controller/CMakeLists.txt b/tricycle_steering_controller/CMakeLists.txt index 9c82ee3574..9dbf5e3543 100644 --- a/tricycle_steering_controller/CMakeLists.txt +++ b/tricycle_steering_controller/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(tricycle_steering_controller LANGUAGES CXX) +project(tricycle_steering_controller) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable @@ -7,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + # find dependencies set(THIS_PACKAGE_INCLUDE_DEPENDS controller_interface @@ -45,10 +49,6 @@ target_link_libraries(tricycle_steering_controller PUBLIC tricycle_steering_controller_parameters) ament_target_dependencies(tricycle_steering_controller PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(tricycle_steering_controller PRIVATE "TRICYCLE_STEERING_CONTROLLER__VISIBILITY_BUILDING_DLL") - pluginlib_export_plugin_description_file( controller_interface tricycle_steering_controller.xml) diff --git a/velocity_controllers/CMakeLists.txt b/velocity_controllers/CMakeLists.txt index feb4eae74f..e7df93d2ab 100644 --- a/velocity_controllers/CMakeLists.txt +++ b/velocity_controllers/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(velocity_controllers LANGUAGES CXX) +project(velocity_controllers) if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable @@ -7,6 +7,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") -Werror=missing-braces) endif() +# using this instead of visibility macros +# S1 from https://github.com/ros-controls/ros2_controllers/issues/1053 +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + set(THIS_PACKAGE_INCLUDE_DEPENDS forward_command_controller pluginlib @@ -29,10 +33,6 @@ target_include_directories(velocity_controllers PUBLIC ) ament_target_dependencies(velocity_controllers PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS}) -# Causes the visibility macros to use dllexport rather than dllimport, -# which is appropriate when building the dll but not consuming it. -target_compile_definitions(velocity_controllers PRIVATE "VELOCITY_CONTROLLERS_BUILDING_DLL") - pluginlib_export_plugin_description_file(controller_interface velocity_controllers_plugins.xml) if(BUILD_TESTING)