[openrtm-commit:02346] r2897 - branches/FSM4RTC/OpenRTM-aist/examples/SeqIO

openrtm @ openrtm.org openrtm @ openrtm.org
2017年 1月 28日 (土) 23:33:53 JST


Author: n-ando
Date: 2017-01-28 23:33:53 +0900 (Sat, 28 Jan 2017)
New Revision: 2897

Modified:
   branches/FSM4RTC/OpenRTM-aist/examples/SeqIO/SeqIn.h
   branches/FSM4RTC/OpenRTM-aist/examples/SeqIO/SeqOut.h
Log:
[FSM4RTC] Some sample components listener have been modified to follow ConnectorListener changes. refs #3871

Modified: branches/FSM4RTC/OpenRTM-aist/examples/SeqIO/SeqIn.h
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/examples/SeqIO/SeqIn.h	2017-01-28 14:29:04 UTC (rev 2896)
+++ branches/FSM4RTC/OpenRTM-aist/examples/SeqIO/SeqIn.h	2017-01-28 14:33:53 UTC (rev 2897)
@@ -34,6 +34,7 @@
 class DataListener
   : public ConnectorDataListenerT<RTC::TimedLong>
 {
+  USE_CONNLISTENER_STATUS;
 public:
   DataListener(const char* name) : m_name(name) {}
   virtual ~DataListener()
@@ -45,8 +46,8 @@
       }
   }
 
-  virtual void operator()(const ConnectorInfo& info,
-                          const TimedLong& data)
+  virtual ReturnCode operator()(ConnectorInfo& info,
+                          TimedLong& data)
   {
     // Connector Listener Dump check
     if(g_Listener_dump_enabled)
@@ -61,6 +62,7 @@
         std::cout << "Data:          " << data.data    << std::endl;
         std::cout << "------------------------------"   << std::endl;
       }
+    return NO_CHANGE;
   };
   std::string m_name;
 };
@@ -69,6 +71,7 @@
 class ConnListener
   : public ConnectorListener
 {
+  USE_CONNLISTENER_STATUS;
 public:
   ConnListener(const char* name) : m_name(name) {}
   virtual ~ConnListener()
@@ -80,7 +83,7 @@
       }
   }
 
-  virtual void operator()(const ConnectorInfo& info)
+  virtual ReturnCode operator()(ConnectorInfo& info)
   {
     // Connector Listener Dump check
     if(g_Listener_dump_enabled)
@@ -94,6 +97,7 @@
         std::cout                                       << std::endl;
         std::cout << "------------------------------"   << std::endl;
       }
+    return NO_CHANGE;
   };
   std::string m_name;
 };

Modified: branches/FSM4RTC/OpenRTM-aist/examples/SeqIO/SeqOut.h
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/examples/SeqIO/SeqOut.h	2017-01-28 14:29:04 UTC (rev 2896)
+++ branches/FSM4RTC/OpenRTM-aist/examples/SeqIO/SeqOut.h	2017-01-28 14:33:53 UTC (rev 2897)
@@ -35,6 +35,7 @@
 class DataListener
   : public ConnectorDataListenerT<RTC::TimedLong>
 {
+  USE_CONNLISTENER_STATUS;
 public:
   DataListener(const char* name) : m_name(name) {}
   virtual ~DataListener()
@@ -46,8 +47,8 @@
       }
   }
 
-  virtual void operator()(const ConnectorInfo& info,
-                          const TimedLong& data)
+  virtual ReturnCode operator()(ConnectorInfo& info,
+                                TimedLong& data)
   {
     // Connector Listener Dump check
     if(g_Listener_dump_enabled)
@@ -62,6 +63,7 @@
         std::cout << "Data:          " << data.data    << std::endl;
         std::cout << "------------------------------"   << std::endl;
       }
+    return NO_CHANGE;
   }
   std::string m_name;
 };
@@ -70,6 +72,7 @@
 class ConnListener
   : public ConnectorListener
 {
+  USE_CONNLISTENER_STATUS;
 public:
   ConnListener(const char* name) : m_name(name) {}
   virtual ~ConnListener()
@@ -81,7 +84,7 @@
       }
   }
 
-  virtual void operator()(const ConnectorInfo& info)
+  virtual ReturnCode operator()(ConnectorInfo& info)
   {
     // Connector Listener Dump check
     if(g_Listener_dump_enabled)
@@ -95,6 +98,7 @@
         std::cout                                       << std::endl;
         std::cout << "------------------------------"   << std::endl;
       }
+    return NO_CHANGE;
   };
   std::string m_name;
 };



More information about the openrtm-commit mailing list