[openrtm-commit:00147] r2158 - trunk/OpenRTM-aist/src/ext/sdo/observer

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2011-06-03 18:32:32 +0900 (Fri, 03 Jun 2011)
New Revision: 2158

Modified:
   trunk/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.cpp
   trunk/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.h
Log:
Some trivial modifications without side effect to functionality have
been applyed. (debug print removed, variable name change)


Modified: trunk/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.cpp
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.cpp	2011-06-03 09:24:11 UTC (rev 2157)
+++ trunk/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.cpp	2011-06-03 09:32:32 UTC (rev 2158)
@@ -332,7 +332,6 @@
   {
     if (m_compstat.activatedListener == NULL)
       {
-        std::cout << "activateL attached" << std::endl;
         m_compstat.activatedListener = 
           m_rtobj->addPostComponentActionListener(POST_ON_ACTIVATED,
                                                   m_compstat,
@@ -340,7 +339,6 @@
       }
     if (m_compstat.deactivatedListener == NULL)
       {
-        std::cout << "deactivateL attached" << std::endl;
         m_compstat.deactivatedListener = 
           m_rtobj->addPostComponentActionListener(POST_ON_DEACTIVATED,
                                                   m_compstat,
@@ -348,7 +346,6 @@
       }
     if (m_compstat.resetListener == NULL)
       {
-        std::cout << "resetL attached" << std::endl;
         m_compstat.resetListener = 
           m_rtobj->addPostComponentActionListener(POST_ON_RESET,
                                                   m_compstat,
@@ -356,7 +353,6 @@
       }
     if (m_compstat.abortingListener == NULL)
       {
-        std::cout << "abortL attached" << std::endl;
         m_compstat.abortingListener = 
           m_rtobj->addPostComponentActionListener(POST_ON_ABORTING,
                                                   m_compstat,
@@ -364,7 +360,6 @@
       }
     if (m_compstat.finalizeListener == NULL)
       {
-        std::cout << "finalizeL attached" << std::endl;
         m_compstat.finalizeListener = 
           m_rtobj->addPostComponentActionListener(POST_ON_FINALIZE,
                                                   m_compstat,

Modified: trunk/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.h
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.h	2011-06-03 09:24:11 UTC (rev 2157)
+++ trunk/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.h	2011-06-03 09:32:32 UTC (rev 2158)
@@ -123,9 +123,9 @@
      * @brief Converting kind to string
      * @endif
      */
-    inline const char* toString(OpenRTM::StatusKind statuskind)
+    inline const char* toString(OpenRTM::StatusKind kind)
     {
-      static const char* kind[] = 
+      static const char* kinds[] = 
         {
           "COMPONENT_PROFILE",
           "RTC_STATUS",
@@ -134,7 +134,7 @@
           "CONFIGURATION",
           "HEARTBEAT"
         };
-      return statuskind < sizeof(kind)/sizeof(char*) ? kind[statuskind] : "";
+      return (size_t)kind < sizeof(kind)/sizeof(char*) ? kinds[kind] : "";
     }
 
     /*!