From 1be4d2d91491509a692ae46bafc6968cb9b94bb8 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Fri, 4 May 2018 13:10:47 -0500 Subject: [PATCH] Fix bug when mixing shared_ptr and bind. (#470) --- .../test/test_register_custom_callbacks.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/rclcpp_lifecycle/test/test_register_custom_callbacks.cpp b/rclcpp_lifecycle/test/test_register_custom_callbacks.cpp index 8168914..c496e59 100644 --- a/rclcpp_lifecycle/test/test_register_custom_callbacks.cpp +++ b/rclcpp_lifecycle/test/test_register_custom_callbacks.cpp @@ -137,16 +137,16 @@ public: TEST_F(TestRegisterCustomCallbacks, custom_callbacks) { auto test_node = std::make_shared("testnode"); - test_node->register_on_configure( - std::bind(&CustomLifecycleNode::on_custom_configure, test_node, std::placeholders::_1)); - test_node->register_on_cleanup(std::bind(&CustomLifecycleNode::on_custom_cleanup, test_node, - std::placeholders::_1)); - test_node->register_on_shutdown(std::bind(&CustomLifecycleNode::on_custom_shutdown, test_node, - std::placeholders::_1)); - test_node->register_on_activate(std::bind(&CustomLifecycleNode::on_custom_activate, test_node, - std::placeholders::_1)); + test_node->register_on_configure(std::bind(&CustomLifecycleNode::on_custom_configure, + test_node.get(), std::placeholders::_1)); + test_node->register_on_cleanup(std::bind(&CustomLifecycleNode::on_custom_cleanup, + test_node.get(), std::placeholders::_1)); + test_node->register_on_shutdown(std::bind(&CustomLifecycleNode::on_custom_shutdown, + test_node.get(), std::placeholders::_1)); + test_node->register_on_activate(std::bind(&CustomLifecycleNode::on_custom_activate, + test_node.get(), std::placeholders::_1)); test_node->register_on_deactivate(std::bind(&CustomLifecycleNode::on_custom_deactivate, - test_node, std::placeholders::_1)); + test_node.get(), std::placeholders::_1)); EXPECT_EQ(State::PRIMARY_STATE_UNCONFIGURED, test_node->get_current_state().id()); EXPECT_EQ(State::PRIMARY_STATE_INACTIVE, test_node->trigger_transition(