addressed comments

ros · Sep 9, 2016 · 835579f · 835579f
1 parent 0dc06b2
commit 835579f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/clients/roscpp/include/ros/spinner.h b/clients/roscpp/include/ros/spinner.h
@@ -112,9 +112,11 @@ class ROSCPP_DECL AsyncSpinner
    * \brief Check if the spinner can be started. The spinner shouldn't be started if
    * another single-threaded spinner is already operating on the callback queue.
    *
-   * This function is not necessary anymore. start() will always start spinning.
+   * This function is not necessary anymore. start() will always try to start spinning
+   * and throw a std::runtime_error if it failed.
    */
-  ROS_DEPRECATED bool canStart();
+  // TODO: deprecate in L-turtle
+  bool canStart();
   /**
    * \brief Start this spinner spinning asynchronously
    */

diff --git a/clients/roscpp/src/libros/spinner.cpp b/clients/roscpp/src/libros/spinner.cpp
@@ -50,12 +50,12 @@ namespace {
 struct SpinnerMonitor
 {
   /* store spinner information per callback queue:
-     Only as unique single-threaded spinner is allowed and we store its thread id.
+     Only one unique single-threaded spinner is allowed and we store its thread id.
      As multiple multi-threaded spinners are allowed in parallel, their number is counted.
   */
   struct Entry
   {
-    Entry(const boost::thread::id &tid) : tid(tid) {}
+    Entry(const boost::thread::id &tid) : tid(tid), num_multi_threaded(0) {}
 
     boost::thread::id tid; // thread id of single-threaded spinner
     unsigned int num_multi_threaded; // number of multi-threaded spinners