Skip to content

Commit

Permalink
Merge pull request #79 from ros2/intra_process_lock
Browse files Browse the repository at this point in the history
Change State to Impl
  • Loading branch information
jacquelinekay committed Dec 3, 2015
2 parents 28318fc + daa1210 commit 2906628
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion test_rclcpp/test/test_allocator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ TEST(CLASSNAME(test_allocator, RMW_IMPLEMENTATION), unique_ptr) {
rclcpp::init(0, nullptr);
auto context = rclcpp::contexts::default_context::get_global_default_context();
auto intra_process_manager_state =
std::make_shared<rclcpp::intra_process_manager::IntraProcessManagerState<UInt32Allocator>>();
std::make_shared<rclcpp::intra_process_manager::IntraProcessManagerImpl<UInt32Allocator>>();
context->get_sub_context<rclcpp::intra_process_manager::IntraProcessManager>(
intra_process_manager_state);
// Use intra-process
Expand Down
2 changes: 1 addition & 1 deletion test_rclcpp/test/test_multiple_service_calls.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ TEST(CLASSNAME(test_multiple_service_calls, RMW_IMPLEMENTATION), multiple_client
for (uint32_t i = 0; i < results.size(); ++i) {
ASSERT_EQ(std::future_status::ready, results[i].wait_for(std::chrono::seconds(0)));
EXPECT_EQ(results[i].get()->sum, 2 * i + 1);
printf("Got response #%u with value %zu\n", i, results[i].get()->sum);
printf("Got response #%u with value %zd\n", i, results[i].get()->sum);
fflush(stdout);
}
}

0 comments on commit 2906628

Please sign in to comment.