Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions gz_ros2_control/include/gz_ros2_control/gz_system.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ class GazeboSimSystemPrivate;
class GazeboSimSystem : public GazeboSimSystemInterface
{
public:
// Documentation Inherited
[[deprecated(
"Replaced by GazeboSimSystem::on_init(const "
"hardware_interface::HardwareComponentInterfaceParams & params).")]]
CallbackReturn on_init(const hardware_interface::HardwareInfo & info) override;

// Documentation Inherited
CallbackReturn on_init(const hardware_interface::HardwareComponentInterfaceParams & params)
override;
Expand Down
23 changes: 0 additions & 23 deletions gz_ros2_control/src/gz_system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -575,29 +575,6 @@ void GazeboSimSystem::registerSensors(
});
}

CallbackReturn
GazeboSimSystem::on_init(const hardware_interface::HardwareInfo & info)
{
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4996)
#else
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
if (hardware_interface::SystemInterface::on_init(info) !=
CallbackReturn::SUCCESS)
{
return CallbackReturn::ERROR;
}
return CallbackReturn::SUCCESS;
#ifdef _MSC_VER
#pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
}

CallbackReturn
GazeboSimSystem::on_init(const hardware_interface::HardwareComponentInterfaceParams & params)
{
Expand Down
Loading