[openrtm-commit:03116] r3191 - branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-01-23 17:06:11 +0900 (Tue, 23 Jan 2018)
New Revision: 3191

Modified:
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortDirectProvider.h
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortSHMConsumer.cpp
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortSHMConsumer.h
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SharedMemoryPort.cpp
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SharedMemoryPort.h
Log:
[compat, bugfix, ->RELENG_1_2] fixed bug.

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortDirectProvider.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortDirectProvider.h	2018-01-23 07:58:05 UTC (rev 3190)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortDirectProvider.h	2018-01-23 08:06:11 UTC (rev 3191)
@@ -229,7 +229,7 @@
      * @param data cdrMemoryStream
      * @endif
      */
-    inline void onBufferRead(const cdrMemoryStream& data)
+    inline void onBufferRead(cdrMemoryStream& data)
     {
       m_listeners->
         connectorData_[ON_BUFFER_READ].notify(m_profile, data);
@@ -244,7 +244,7 @@
      * @param data cdrMemoryStream
      * @endif
      */
-    inline void onSend(const cdrMemoryStream& data)
+    inline void onSend(cdrMemoryStream& data)
     {
       m_listeners->
         connectorData_[ON_SEND].notify(m_profile, data);

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortSHMConsumer.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortSHMConsumer.cpp	2018-01-23 07:58:05 UTC (rev 3190)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortSHMConsumer.cpp	2018-01-23 08:06:11 UTC (rev 3191)
@@ -246,7 +246,7 @@
    */
   OutPortConsumer::ReturnCode
   OutPortSHMConsumer::convertReturn(::OpenRTM::PortStatus status,
-                                         const cdrMemoryStream& data)
+                                         cdrMemoryStream& data)
   {
     switch(status)
       {

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortSHMConsumer.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortSHMConsumer.h	2018-01-23 07:58:05 UTC (rev 3190)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortSHMConsumer.h	2018-01-23 08:06:11 UTC (rev 3191)
@@ -211,7 +211,7 @@
      * @endif
      */
     OutPortConsumer::ReturnCode convertReturn(::OpenRTM::PortStatus status,
-                                              const cdrMemoryStream& data);
+                                              cdrMemoryStream& data);
 
     /*!
      * @if jp

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SharedMemoryPort.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SharedMemoryPort.cpp	2018-01-23 07:58:05 UTC (rev 3190)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SharedMemoryPort.cpp	2018-01-23 08:06:11 UTC (rev 3191)
@@ -248,7 +248,7 @@
   *
   * @endif
   */
-	void SharedMemoryPort::write(const cdrMemoryStream& data)
+	void SharedMemoryPort::write(cdrMemoryStream& data)
   {
 	  CORBA::ULongLong data_size = (CORBA::ULongLong)data.bufSize();
 	  if (data_size + sizeof(CORBA::ULongLong) > m_shmem.get_size())

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SharedMemoryPort.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SharedMemoryPort.h	2018-01-23 07:58:05 UTC (rev 3190)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SharedMemoryPort.h	2018-01-23 08:06:11 UTC (rev 3191)
@@ -177,7 +177,7 @@
      *
      * @endif
      */
-    virtual void write(const cdrMemoryStream& data);
+    virtual void write(cdrMemoryStream& data);
      /*!
      * @if jp
      * @brief データを読み込む