Skip to content

Commit

Permalink
Merge pull request #148 from ros2/cpplint
Browse files Browse the repository at this point in the history
Fix cpplint warnings
  • Loading branch information
esteve committed Nov 6, 2015
2 parents 361faf6 + 39b66fa commit e42d7d7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions rclcpp/include/rclcpp/timer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ class GenericTimer : public TimerBase

using WallTimer = GenericTimer<std::chrono::steady_clock>;

} /* namespace timer */
} /* namespace rclcpp */
} // namespace timer
} // namespace rclcpp

#endif // RCLCPP__TIMER_HPP_
3 changes: 2 additions & 1 deletion rclcpp/src/rclcpp/executors/single_threaded_executor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@

using rclcpp::executors::single_threaded_executor::SingleThreadedExecutor;

SingleThreadedExecutor::SingleThreadedExecutor(rclcpp::memory_strategy::MemoryStrategy::SharedPtr ms)
SingleThreadedExecutor::SingleThreadedExecutor(
rclcpp::memory_strategy::MemoryStrategy::SharedPtr ms)
: executor::Executor(ms) {}


Expand Down

0 comments on commit e42d7d7

Please sign in to comment.