[openrtm-commit:01770] r670 - in trunk/OpenRTM-aist-Python/OpenRTM_aist: . RTM_IDL

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-02-27 10:36:22 +0900 (Sat, 27 Feb 2016)
New Revision: 670

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortSHMConsumer.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/RTM_IDL/SharedMemory.idl
   trunk/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py
Log:
[incompat,bugfix,func,->RELENG_1_2] bug fix. refs #3410

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py	2016-02-27 01:35:26 UTC (rev 669)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py	2016-02-27 01:36:22 UTC (rev 670)
@@ -159,7 +159,7 @@
     try:
       ref_ = self.getObject()
       if ref_:
-        inportcdr = ref_._narrow(OpenRTM__POA.SharedMemory)
+        inportcdr = ref_._narrow(OpenRTM__POA.PortSharedMemory)
         
         guard = OpenRTM_aist.ScopedLock(self._mutex)
         

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortSHMConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortSHMConsumer.py	2016-02-27 01:35:26 UTC (rev 669)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortSHMConsumer.py	2016-02-27 01:36:22 UTC (rev 670)
@@ -139,7 +139,7 @@
     self._rtcout.RTC_PARANOID("get()")
     
     try:
-      outportcdr = self.getObject()._narrow(OpenRTM__POA.SharedMemory)
+      outportcdr = self.getObject()._narrow(OpenRTM__POA.PortSharedMemory)
       
       if self._outportcdr is None:
         outportcdr.setInterface(self._shmem._this())

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/RTM_IDL/SharedMemory.idl
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/RTM_IDL/SharedMemory.idl	2016-02-27 01:35:26 UTC (rev 669)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/RTM_IDL/SharedMemory.idl	2016-02-27 01:36:22 UTC (rev 670)
@@ -23,12 +23,12 @@
     UNKNOWN_ERROR
   };
 
-  interface SharedMemory
+  interface PortSharedMemory
   {
     void open_memory(in long memory_size, in string shm_address);
     void create_memory(in long memory_size, in string shm_address);
     void close_memory(in boolean unlink);
-    void setInterface(in SharedMemory sm);
+    void setInterface(in PortSharedMemory sm);
     PortStatus put();
     PortStatus get();
   };

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py	2016-02-27 01:35:26 UTC (rev 669)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py	2016-02-27 01:36:22 UTC (rev 670)
@@ -40,7 +40,7 @@
 #
 # @endif
 #
-class SharedMemory(OpenRTM__POA.SharedMemory):
+class SharedMemory(OpenRTM__POA.PortSharedMemory):
   default_size = 8
   default_memory_size = 2*1024*1024