This commit is contained in:
Jackie Kay 2015-07-20 10:45:48 -07:00
parent bc89a4c2f0
commit 99c81ce617
3 changed files with 4 additions and 3 deletions

View file

@ -41,7 +41,8 @@ public:
RCLCPP_MAKE_SHARED_DEFINITIONS(MultiThreadedExecutor); RCLCPP_MAKE_SHARED_DEFINITIONS(MultiThreadedExecutor);
MultiThreadedExecutor(memory_strategy::MemoryStrategy::SharedPtr ms = MultiThreadedExecutor(memory_strategy::MemoryStrategy::SharedPtr ms =
memory_strategy::create_default_strategy()) : executor::Executor(ms) memory_strategy::create_default_strategy())
: executor::Executor(ms)
{ {
number_of_threads_ = std::thread::hardware_concurrency(); number_of_threads_ = std::thread::hardware_concurrency();
if (number_of_threads_ == 0) { if (number_of_threads_ == 0) {

View file

@ -42,7 +42,8 @@ public:
RCLCPP_MAKE_SHARED_DEFINITIONS(SingleThreadedExecutor); RCLCPP_MAKE_SHARED_DEFINITIONS(SingleThreadedExecutor);
SingleThreadedExecutor(memory_strategy::MemoryStrategy::SharedPtr ms = SingleThreadedExecutor(memory_strategy::MemoryStrategy::SharedPtr ms =
memory_strategy::create_default_strategy()) : executor::Executor(ms) { } memory_strategy::create_default_strategy())
: executor::Executor(ms) {}
virtual ~SingleThreadedExecutor() {} virtual ~SingleThreadedExecutor() {}

View file

@ -55,7 +55,6 @@ public:
void ** borrow_handles(HandleType type, size_t number_of_handles) void ** borrow_handles(HandleType type, size_t number_of_handles)
{ {
std::cout << "static borrow handles" << std::endl;
switch (type) { switch (type) {
case HandleType::subscriber_handle: case HandleType::subscriber_handle:
if (number_of_handles > max_subscribers_) { if (number_of_handles > max_subscribers_) {