niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #161 from ros2/fix_import_symbols

Browse source 
Fix cpplint and windows build
This commit is contained in:
Esteve Fernandez 2015-11-24 10:30:19 -08:00
commit 12859aca2c
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rclcpp/include/rclcpp/node.hpp
View file

@ -172,7 +172,6 @@ public:
* \param[in] group Callback group to execute this timer's callback in. * \param[in] group Callback group to execute this timer's callback in.
*/ */
template<typename CallbackType> template<typename CallbackType>
RCLCPP_PUBLIC
typename rclcpp::timer::WallTimer<CallbackType>::SharedPtr typename rclcpp::timer::WallTimer<CallbackType>::SharedPtr
create_wall_timer( create_wall_timer(
std::chrono::nanoseconds period, std::chrono::nanoseconds period,

3
rclcpp/include/rclcpp/timer.hpp
View file

@ -41,7 +41,7 @@ public:
RCLCPP_SMART_PTR_DEFINITIONS_NOT_COPYABLE(TimerBase); RCLCPP_SMART_PTR_DEFINITIONS_NOT_COPYABLE(TimerBase);
RCLCPP_PUBLIC RCLCPP_PUBLIC
TimerBase(std::chrono::nanoseconds period); explicit TimerBase(std::chrono::nanoseconds period);
RCLCPP_PUBLIC RCLCPP_PUBLIC
virtual ~TimerBase(); virtual ~TimerBase();
@ -142,7 +142,6 @@ public:
void void
execute_callback_delegate() execute_callback_delegate()
{ {
//callback_(std::move(std::shared_ptr<TimerBase>(this)));
callback_(*this); callback_(*this);
} }