Skip to content

Commit

Permalink
Switch to std::unique_ptr<DummyExecutor>(new DummyExecutor())
Browse files Browse the repository at this point in the history
Windows marks std::make_unique as [[nodiscard]], which causes
a build warning there.  Fake it out by using std::unique_ptr
with a new instead.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
  • Loading branch information
clalancette committed Jan 16, 2021
1 parent 63a3f2e commit 6d5cd1c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions rclcpp/test/rclcpp/test_executor.cpp
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(
std::make_unique<DummyExecutor>(),
std::unique_ptr<DummyExecutor>(new 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(
std::make_unique<DummyExecutor>(),
std::unique_ptr<DummyExecutor>(new DummyExecutor()),
std::runtime_error("Failed to create wait set in Executor constructor: error not set"));
}

Expand Down

0 comments on commit 6d5cd1c

Please sign in to comment.