[openrtm-commit:03000] r3134 - in trunk/OpenRTM-aist: examples/Analyzer examples/Throughput src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-12-11 19:08:53 +0900 (Mon, 11 Dec 2017)
New Revision: 3134

Modified:
   trunk/OpenRTM-aist/examples/Analyzer/Analyzer.h
   trunk/OpenRTM-aist/examples/Throughput/Throughput.h
   trunk/OpenRTM-aist/src/lib/rtm/OutPort.h
Log:
[compat] refs #4391

Modified: trunk/OpenRTM-aist/examples/Analyzer/Analyzer.h
===================================================================
--- trunk/OpenRTM-aist/examples/Analyzer/Analyzer.h	2017-12-11 09:48:51 UTC (rev 3133)
+++ trunk/OpenRTM-aist/examples/Analyzer/Analyzer.h	2017-12-11 10:08:53 UTC (rev 3134)
@@ -339,10 +339,11 @@
 	DataListener(Analyzer *comp);
 	virtual ~DataListener();
 
-	virtual void operator()(const ConnectorInfo& info,
-		const TimedOctetSeq& data)
+	virtual ReturnCode operator()(ConnectorInfo& info,
+		TimedOctetSeq& data)
 	{
 		m_comp->writeData(data);
+		return NO_CHANGE;
 	}
 	Analyzer *m_comp;
 

Modified: trunk/OpenRTM-aist/examples/Throughput/Throughput.h
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/Throughput.h	2017-12-11 09:48:51 UTC (rev 3133)
+++ trunk/OpenRTM-aist/examples/Throughput/Throughput.h	2017-12-11 10:08:53 UTC (rev 3134)
@@ -434,10 +434,11 @@
 public:
   DataListener(Throughput *comp) : m_comp(comp)  {};
   virtual ~DataListener() {};
-  virtual void operator()(const ConnectorInfo& info,
-                          const DataType& data)
+  virtual ReturnCode operator()(ConnectorInfo& info,
+                          DataType& data)
   {
     m_comp->receiveData(data.tm, data.data.length());
+	return NO_CHANGE;
   }
   Throughput* m_comp;
 };
@@ -448,7 +449,7 @@
 public:
   ConnListener(Throughput *comp) : m_comp(comp) {}
   virtual ~ConnListener() {}
-  virtual void operator()(const ConnectorInfo& info)
+  virtual ReturnCode operator()(ConnectorInfo& info)
   {
 // Connector Listener: ON_CONNECT
 // Profile::name:      ConsoleIn0.out_ConsoleOut0.in
@@ -477,6 +478,7 @@
     std::cout                                       << std::endl;
     std::cout << "------------------------------"   << std::endl;
     m_comp->setConnectorProfile(info);
+	return NO_CHANGE;
   };
   Throughput* m_comp;
 };

Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPort.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPort.h	2017-12-11 09:48:51 UTC (rev 3133)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPort.h	2017-12-11 10:08:53 UTC (rev 3134)
@@ -241,7 +241,8 @@
             if (m_onWriteConvert != NULL)
               {
                 RTC_DEBUG(("m_connectors.OnWriteConvert called"));
-                ret = m_connectors[i]->write(((*m_onWriteConvert)(value)));
+                DataType conv_value = ((*m_onWriteConvert)(value));
+                ret = m_connectors[i]->write(conv_value);
               }
             else
               {