Skip to content

Commit 300d5f6

Browse files
committed
remove node namespace
Signed-off-by: M. Fatih Cırıt <mfc@autoware.org>
1 parent 9efb556 commit 300d5f6

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

common/autoware_node/include/autoware/node/node.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <string>
2323

24-
namespace autoware::node
24+
namespace autoware
2525
{
2626
using CallbackReturn = rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn;
2727

@@ -36,6 +36,6 @@ class Node : public rclcpp_lifecycle::LifecycleNode
3636
protected:
3737
CallbackReturn on_shutdown(const rclcpp_lifecycle::State & state) override;
3838
};
39-
} // namespace autoware::node
39+
} // namespace autoware
4040

4141
#endif // AUTOWARE__NODE__NODE_HPP_

common/autoware_node/src/node.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#include <string>
1919

20-
namespace autoware::node
20+
namespace autoware
2121
{
2222
Node::Node(
2323
const std::string & node_name, const std::string & ns, const rclcpp::NodeOptions & options)
@@ -35,4 +35,4 @@ CallbackReturn Node::on_shutdown(const rclcpp_lifecycle::State & state)
3535
get_node_base_interface()->get_fully_qualified_name(), state.label().c_str());
3636
return CallbackReturn::SUCCESS;
3737
}
38-
} // namespace autoware::node
38+
} // namespace autoware

common/autoware_node/test/test_an_init_shutdown.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ TEST_F(AutowareNodeInitShutdown, NodeInitShutdown)
3636
std::shared_ptr<rclcpp::executors::SingleThreadedExecutor> executor;
3737
executor = std::make_shared<rclcpp::executors::SingleThreadedExecutor>();
3838

39-
autoware::node::Node::SharedPtr autoware_node =
40-
std::make_shared<autoware::node::Node>("test_node", "test_ns", node_options_an_);
39+
autoware::Node::SharedPtr autoware_node =
40+
std::make_shared<autoware::Node>("test_node", "test_ns", node_options_an_);
4141

4242
executor->add_node(autoware_node->get_node_base_interface());
4343

demos/autoware_test_node/src/include/test_node.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
namespace autoware::test_node
2222
{
2323

24-
class TestNode : public autoware::node::Node
24+
class TestNode : public autoware::Node
2525
{
2626
public:
2727
explicit TestNode(const rclcpp::NodeOptions & options = rclcpp::NodeOptions());

demos/autoware_test_node/src/test_node.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
namespace autoware::test_node
2020
{
2121
TestNode::TestNode(const rclcpp::NodeOptions & options)
22-
: autoware::node::Node("test_node", "", options)
22+
: autoware::Node("test_node", "", options)
2323
{
2424
RCLCPP_DEBUG(
2525
get_logger(), "TestNode %s constructor was called.",

0 commit comments

Comments
 (0)