[openrtm-commit:02804] r3040 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-09-05 22:33:02 +0900 (Tue, 05 Sep 2017)
New Revision: 3040

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/ConnectorListener.h
   trunk/OpenRTM-aist/src/lib/rtm/OutPortConnector.h
   trunk/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.cpp
   trunk/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp
   trunk/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp
Log:
[build, CMake] Support TAO.

Modified: trunk/OpenRTM-aist/src/lib/rtm/ConnectorListener.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ConnectorListener.h	2017-09-04 22:43:29 UTC (rev 3039)
+++ trunk/OpenRTM-aist/src/lib/rtm/ConnectorListener.h	2017-09-05 13:33:02 UTC (rev 3040)
@@ -337,7 +337,7 @@
 #ifdef ORB_IS_ORBEXPRESS
       cdrMemoryStream cdr(cdrdata);
 #elif defined(ORB_IS_TAO)
-	  cdrMemoryStream cdr(cdrdata);
+      cdrMemoryStream cdr(cdrdata);
 #else
       cdrMemoryStream cdr(cdrdata.bufPtr(), cdrdata.bufSize());
 #endif
@@ -360,7 +360,7 @@
         }
        cdr >> data;
 #elif defined(ORB_IS_TAO)
-	  cdr.cdr << data;
+       TAO_InputCDR(cdr.cdr) >> data;
 #else
       if (endian[0] == "little")
         {

Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPortConnector.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPortConnector.h	2017-09-04 22:43:29 UTC (rev 3039)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPortConnector.h	2017-09-05 13:33:02 UTC (rev 3040)
@@ -255,9 +255,9 @@
       m_cdr.is_little_endian(isLittleEndian());
       m_cdr << data;
 #elif defined(ORB_IS_TAO)
-	  //m_cdr.cdr.;
-	  RTC_TRACE(("connector endian: %s", isLittleEndian() ? "little" : "big"));
-	  m_cdr.cdr << data;
+      m_cdr.cdr.reset();
+      RTC_TRACE(("connector endian: %s", isLittleEndian() ? "little" : "big"));
+      m_cdr.cdr << data;
 #else
       m_cdr.rewindPtrs();
 

Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.cpp	2017-09-04 22:43:29 UTC (rev 3039)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.cpp	2017-09-05 13:33:02 UTC (rev 3040)
@@ -109,7 +109,7 @@
 #ifdef ORB_IS_ORBEXPRESS
             data.write_array_1(cdr_data->get_buffer(), (CORBA::ULong)cdr_data->length());
 #elif defined(ORB_IS_TAO)
-			data.cdr.write_octet_array(cdr_data->get_buffer(), (CORBA::ULong)cdr_data->length());
+            data.cdr.write_octet_array(cdr_data->get_buffer(), (CORBA::ULong)cdr_data->length());
 #else
             data.put_octet_array(&(cdr_data[0]), (int)cdr_data->length());
 #endif

Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp	2017-09-04 22:43:29 UTC (rev 3039)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp	2017-09-05 13:33:02 UTC (rev 3040)
@@ -198,8 +198,7 @@
 #ifdef ORB_IS_ORBEXPRESS
         cdr.read_array_1(data->get_buffer(), len);
 #elif defined(ORB_IS_TAO)
-	TAO_InputCDR cdr_tmp = cdr.cdr;
-	cdr_tmp.read_octet_array(&((*data)[0]), len);
+	TAO_InputCDR(cdr.cdr).read_octet_array(&((*data)[0]), len);
 #else
         cdr.get_octet_array(&((*data)[0]), len);
 #endif

Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp	2017-09-04 22:43:29 UTC (rev 3039)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp	2017-09-05 13:33:02 UTC (rev 3040)
@@ -89,7 +89,7 @@
 #ifdef ORB_IS_ORBEXPRESS
     RTC_PARANOID(("data size = %d bytes", data.size_written()));
 #elif defined(ORB_IS_TAO)
-	RTC_PARANOID(("data size = %d bytes", data.cdr.length()));
+    RTC_PARANOID(("data size = %d bytes", data.cdr.length()));
 #else
     RTC_PARANOID(("data size = %d bytes", data.bufSize()));
 #endif