roscpp: add missing member function ros::SteadyTimer::hasStarted()

ros · Dec 14, 2018 · c37a75b · meyerj · Dec 14, 2018 · c37a75b
1 parent 3afb85d
commit c37a75b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/clients/roscpp/src/libros/steady_timer.cpp b/clients/roscpp/src/libros/steady_timer.cpp
@@ -110,6 +110,16 @@ SteadyTimer::Impl::~Impl()
   stop();
 }
 
+bool SteadyTimer::Impl::hasStarted() const
+{
+  return started_;
+}
+
+bool SteadyTimer::Impl::isValid()
+{
+  return !period_.isZero();
+}
+
 void SteadyTimer::Impl::start()
 {
   if (!started_)
@@ -119,6 +129,7 @@ void SteadyTimer::Impl::start()
     {
       tracked_object = tracked_object_.lock();
     }
+
     timer_handle_ = TimerManager<SteadyTime, WallDuration, SteadyTimerEvent>::global().add(period_, callback_, callback_queue_, tracked_object, oneshot_);
     started_ = true;
   }
@@ -134,11 +145,6 @@ void SteadyTimer::Impl::stop()
   }
 }
 
-bool SteadyTimer::Impl::isValid()
-{
-  return !period_.isZero();
-}
-
 bool SteadyTimer::Impl::hasPending()
 {
   if (!isValid() || timer_handle_ == -1)

diff --git a/clients/roscpp/src/libros/timer.cpp b/clients/roscpp/src/libros/timer.cpp
@@ -93,6 +93,7 @@ void Timer::Impl::setPeriod(const Duration& period, bool reset)
   TimerManager<Time, Duration, TimerEvent>::global().setPeriod(timer_handle_, period, reset);
 }
 
+
 Timer::Timer(const TimerOptions& ops)
 : impl_(new Impl)
 {
-Original file line number
+Diff line change
@@ Expand Up @@
       TimerManager<Time, Duration, TimerEvent>::global().setPeriod(timer_handle_, period, reset);
     }
     Timer::Timer(const TimerOptions& ops)
     : impl_(new Impl)
     {
@@ Expand Down @@