Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change to using unique_ptrs for DummyExecutor. #1517

Merged
merged 3 commits into from
Jan 20, 2021
Merged

Change to using unique_ptrs for DummyExecutor. #1517

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cebd567
Change to using unique_ptrs for DummyExecutor.
clalancette Jan 15, 2021
4662418
Switch to std::unique_ptr<DummyExecutor>(new DummyExecutor())
clalancette Jan 16, 2021
9ff8d5b
Fixes from review.
clalancette Jan 19, 2021
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
4 changes: 2 additions & 2 deletions rclcpp/test/rclcpp/test_executor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,14 @@ TEST_F(TestExecutor, constructor_bad_guard_condition_init) {
auto mock = mocking_utils::patch_and_return(
"lib:rclcpp", rcl_guard_condition_init, RCL_RET_ERROR);
EXPECT_THROW(
new DummyExecutor(),
static_cast<void>(std::make_unique<DummyExecutor>()),
rclcpp::exceptions::RCLError);
}

TEST_F(TestExecutor, constructor_bad_wait_set_init) {
auto mock = mocking_utils::patch_and_return("lib:rclcpp", rcl_wait_set_init, RCL_RET_ERROR);
RCLCPP_EXPECT_THROW_EQ(
new DummyExecutor(),
static_cast<void>(std::make_unique<DummyExecutor>()),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need to do anything with this, but why is this a pointer in the first place? Couldn't it be on the stack? Unlike some entities in rclcpp, the executor need not be a smart pointer.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would probably end up longer anyways, because we'd need to "use" the variable we create to avoid unused variable warnings.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I honestly don't remember why I wrote it this way originally. I guess I could move it to the stack, but like you say it would probably be longer. So I'll leave it for now.

std::runtime_error("Failed to create wait set in Executor constructor: error not set"));
}

Expand Down