Merge pull request #60 from ros2/executor_inherit_constructor

Pass memory strategy to Executor constructor in child classes
This commit is contained in:
Jackie Kay 2015-07-21 13:33:55 -07:00
commit 76963dd24d
3 changed files with 7 additions and 3 deletions

View file

@ -42,7 +42,7 @@ class Executor
public:
RCLCPP_MAKE_SHARED_DEFINITIONS(Executor);
Executor(memory_strategy::MemoryStrategy::SharedPtr ms =
explicit Executor(memory_strategy::MemoryStrategy::SharedPtr ms =
memory_strategy::create_default_strategy())
: interrupt_guard_condition_(rmw_create_guard_condition()),
memory_strategy_(ms)

View file

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

View file

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