-
-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
changed line endings in
rus-humble-pid-controller patch
- Loading branch information
Showing
1 changed file
with
28 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,28 @@ | ||
| diff --git a/pid_controller/CMakeLists.txt b/pid_controller/CMakeLists.txt | ||
| index 81cbe6f006..d7798b579b 100644 | ||
| --- a/pid_controller/CMakeLists.txt | ||
| +++ b/pid_controller/CMakeLists.txt | ||
| @@ -45,7 +45,7 @@ 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_BUILDING_DLL") | ||
| +target_compile_definitions(pid_controller PRIVATE "PID_CONTROLLER__VISIBILITY_BUILDING_DLL") | ||
|
|
||
| pluginlib_export_plugin_description_file(controller_interface pid_controller.xml) | ||
|
|
||
| diff --git a/pid_controller/include/pid_controller/pid_controller.hpp b/pid_controller/include/pid_controller/pid_controller.hpp | ||
| index 105a915442..4919a739ce 100644 | ||
| --- a/pid_controller/include/pid_controller/pid_controller.hpp | ||
| +++ b/pid_controller/include/pid_controller/pid_controller.hpp | ||
| @@ -119,8 +119,10 @@ class PidController : public controller_interface::ChainableControllerInterface | ||
| std::unique_ptr<ControllerStatePublisher> state_publisher_; | ||
|
|
||
| // override methods from ChainableControllerInterface | ||
| + PID_CONTROLLER__VISIBILITY_PUBLIC | ||
| std::vector<hardware_interface::CommandInterface> on_export_reference_interfaces() override; | ||
|
|
||
| + PID_CONTROLLER__VISIBILITY_PUBLIC | ||
| bool on_set_chained_mode(bool chained_mode) override; | ||
|
|
||
| // internal methods | ||
| diff --git a/pid_controller/CMakeLists.txt b/pid_controller/CMakeLists.txt | ||
| index 81cbe6f006..d7798b579b 100644 | ||
| --- a/pid_controller/CMakeLists.txt | ||
| +++ b/pid_controller/CMakeLists.txt | ||
| @@ -45,7 +45,7 @@ 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_BUILDING_DLL") | ||
| +target_compile_definitions(pid_controller PRIVATE "PID_CONTROLLER__VISIBILITY_BUILDING_DLL") | ||
|
|
||
| pluginlib_export_plugin_description_file(controller_interface pid_controller.xml) | ||
|
|
||
| diff --git a/pid_controller/include/pid_controller/pid_controller.hpp b/pid_controller/include/pid_controller/pid_controller.hpp | ||
| index 105a915442..4919a739ce 100644 | ||
| --- a/pid_controller/include/pid_controller/pid_controller.hpp | ||
| +++ b/pid_controller/include/pid_controller/pid_controller.hpp | ||
| @@ -119,8 +119,10 @@ class PidController : public controller_interface::ChainableControllerInterface | ||
| std::unique_ptr<ControllerStatePublisher> state_publisher_; | ||
|
|
||
| // override methods from ChainableControllerInterface | ||
| + PID_CONTROLLER__VISIBILITY_PUBLIC | ||
| std::vector<hardware_interface::CommandInterface> on_export_reference_interfaces() override; | ||
|
|
||
| + PID_CONTROLLER__VISIBILITY_PUBLIC | ||
| bool on_set_chained_mode(bool chained_mode) override; | ||
|
|
||
| // internal methods |