[openrtm-commit:02276] r2880 - branches/FSM4RTC/OpenRTM-aist/examples/SimpleIO

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2017-01-19 18:42:45 +0900 (Thu, 19 Jan 2017)
New Revision: 2880

Modified:
   branches/FSM4RTC/OpenRTM-aist/examples/SimpleIO/ConsoleIn.h
   branches/FSM4RTC/OpenRTM-aist/examples/SimpleIO/ConsoleOut.h
Log:
[FSM4RTC,incompat] ConnectorListener, ConnectorDataListener interfaces have been changed. refs #3871

Modified: branches/FSM4RTC/OpenRTM-aist/examples/SimpleIO/ConsoleIn.h
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/examples/SimpleIO/ConsoleIn.h	2017-01-19 08:37:36 UTC (rev 2879)
+++ branches/FSM4RTC/OpenRTM-aist/examples/SimpleIO/ConsoleIn.h	2017-01-19 09:42:45 UTC (rev 2880)
@@ -35,6 +35,7 @@
 class DataListener
   : public ConnectorDataListenerT<RTC::TimedLong>
 {
+  USE_CONNLISTENER_STATUS;
 public:
   DataListener(const char* name) : m_name(name) {}
   virtual ~DataListener()
@@ -42,8 +43,8 @@
     std::cout << "dtor of " << m_name << std::endl;
   }
 
-  virtual void operator()(const ConnectorInfo& info,
-                          const TimedLong& data)
+  virtual ReturnCode operator()(ConnectorInfo& info,
+                                TimedLong& data)
   {
     std::cout << "------------------------------"   << std::endl;
     std::cout << "Data Listener: " << m_name       << std::endl;
@@ -54,6 +55,7 @@
 //    std::cout                                       << std::endl;
     std::cout << "Data:          " << data.data    << std::endl;
     std::cout << "------------------------------"   << std::endl;
+    return NO_CHANGE;
   };
   std::string m_name;
 };
@@ -62,6 +64,7 @@
 class ConnListener
   : public ConnectorListener
 {
+  USE_CONNLISTENER_STATUS;
 public:
   ConnListener(const char* name) : m_name(name) {}
   virtual ~ConnListener()
@@ -69,7 +72,7 @@
     std::cout << "dtor of " << m_name << std::endl;
   }
 
-  virtual void operator()(const ConnectorInfo& info)
+  virtual ReturnCode operator()(ConnectorInfo& info)
   {
     std::cout << "------------------------------"   << std::endl;
     std::cout << "Connector Listener: " << m_name       << std::endl;
@@ -79,6 +82,7 @@
     std::cout << info.properties;
     std::cout                                       << std::endl;
     std::cout << "------------------------------"   << std::endl;
+    return NO_CHANGE;
   };
   std::string m_name;
 };

Modified: branches/FSM4RTC/OpenRTM-aist/examples/SimpleIO/ConsoleOut.h
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/examples/SimpleIO/ConsoleOut.h	2017-01-19 08:37:36 UTC (rev 2879)
+++ branches/FSM4RTC/OpenRTM-aist/examples/SimpleIO/ConsoleOut.h	2017-01-19 09:42:45 UTC (rev 2880)
@@ -35,6 +35,7 @@
 class DataListener
   : public ConnectorDataListenerT<RTC::TimedLong>
 {
+  USE_CONNLISTENER_STATUS;
 public:
   DataListener(const char* name) : m_name(name) {}
   virtual ~DataListener()
@@ -42,8 +43,8 @@
     std::cout << "dtor of " << m_name << std::endl;
   }
 
-  virtual void operator()(const ConnectorInfo& info,
-                          const TimedLong& data)
+  virtual ReturnCode operator()(ConnectorInfo& info,
+                                TimedLong& data)
   {
     std::cout << "------------------------------"   << std::endl;
     std::cout << "Data Listener: " << m_name       << std::endl;
@@ -54,6 +55,7 @@
 //    std::cout                                       << std::endl;
     std::cout << "Data:          " << data.data    << std::endl;
     std::cout << "------------------------------"   << std::endl;
+    return NO_CHANGE;
   };
   std::string m_name;
 };
@@ -62,6 +64,7 @@
 class ConnListener
   : public ConnectorListener
 {
+  USE_CONNLISTENER_STATUS;
 public:
   ConnListener(const char* name) : m_name(name) {}
   virtual ~ConnListener()
@@ -69,7 +72,7 @@
     std::cout << "dtor of " << m_name << std::endl;
   }
 
-  virtual void operator()(const ConnectorInfo& info)
+  virtual ReturnCode operator()(ConnectorInfo& info)
   {
     std::cout << "------------------------------"   << std::endl;
     std::cout << "Connector Listener: " << m_name       << std::endl;
@@ -79,6 +82,7 @@
     std::cout << info.properties;
     std::cout                                       << std::endl;
     std::cout << "------------------------------"   << std::endl;
+    return NO_CHANGE;
   };
   std::string m_name;
 };