[openrtm-commit:03149] r3207 - trunk/OpenRTM-aist/src/lib/rtm

openrtm ＠ openrtm.org openrtm ＠ openrtm.org
2018年 1月 25日 (木) 15:21:31 JST 

Author: miyamoto
Date: 2018-01-25 15:21:31 +0900 (Thu, 25 Jan 2018)
New Revision: 3207

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt
   trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
   trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h
   trunk/OpenRTM-aist/src/lib/rtm/ConnectorListener.h
   trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrUDPConsumer.cpp
   trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrUDPConsumer.h
   trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrUDPProvider.h
   trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
Log:
[compat, bugfix, TAO] fixed bug.

Modified: trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt	2018-01-25 02:43:28 UTC (rev 3206)
+++ trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt	2018-01-25 06:21:31 UTC (rev 3207)
@@ -257,6 +257,7 @@
 	OutPortSHMProvider.h
 	SharedMemoryPort.h
 	Timestamp.h
+	SimulatorExecutionContext.h
 	${PROJECT_BINARY_DIR}/config_rtc.h
 	${PROJECT_BINARY_DIR}/version.h
 )
@@ -329,6 +330,7 @@
 	OutPortSHMConsumer.cpp
 	OutPortSHMProvider.cpp
 	SharedMemoryPort.cpp
+	SimulatorExecutionContext.cpp
 	${rtm_headers}
 )
 

Modified: trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp	2018-01-25 02:43:28 UTC (rev 3206)
+++ trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp	2018-01-25 06:21:31 UTC (rev 3207)
@@ -48,7 +48,7 @@
 
   /*!
    * @if jp
-   * @brief IOR •¶Žš—ñ‚ðIOR\‘¢‘Ì‚Ö•ÏŠ·‚·‚é
+   * @brief IOR ʸ»úÎó¤òIOR¹½Â¤ÂΤØÊÑ´¹¤¹¤ë
    * @else
    * @brief Convert from IOR string to IOR structure
    * @endif
@@ -116,7 +116,7 @@
 
   /*!
    * @if jp
-   * @brief IOR\‘¢‘Ì‚ðIOR•¶Žš—ñ‚Ö•ÏŠ·‚·‚é
+   * @brief IOR¹½Â¤ÂΤòIORʸ»úÎó¤ØÊÑ´¹¤¹¤ë
    * @else
    * @brief Convert from IOR structure to IOR string 
    * @endif
@@ -178,7 +178,7 @@
 
   /*!
    * @if jp
-   * @brief IOR“à‚̃Gƒ“ƒhƒ|ƒCƒ“ƒg‚ð’uŠ·‚·‚é
+   * @brief IORÆâ¤Î¥¨¥ó¥É¥Ý¥¤¥ó¥È¤òÃÖ´¹¤¹¤ë
    * @else
    * @brief Replace endpoint address in IOR entry
    * @endif
@@ -223,7 +223,7 @@
 
   /*!
    * @if jp
-   * @brief IOR•¶Žš—ñ‚©‚çî•ñ‚𒊏o‚µƒtƒH[ƒ}ƒbƒgÏ‚Ý‚Ì•¶Žš—ñ‚Æ‚µ‚Ä•Ô‚·
+   * @brief IORʸ»úÎ󤫤é¾ðÊó¤òÃê½Ð¤·¥Õ¥©¡¼¥Þ¥Ã¥ÈºÑ¤ß¤Îʸ»úÎó¤È¤·¤ÆÊÖ¤¹
    * @else
    * @brief Extracts information from IOR string and returns formatted string
    * @endif
@@ -355,7 +355,7 @@
 #ifndef ORB_IS_RTORB
   //------------------------------------------------------------
   // static functions
-
+#if !defined(ORB_IS_RTORB) && !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
   static void print_key(std::stringstream& sstr, OctetUSequence& key)
   {
     // Output key as text
@@ -412,7 +412,7 @@
       }
     print_key(sstr, id);
   }
-  
+
   static int get_poa_info(OctetUSequence& key, StringUSequence& poas_out,
                           int& transient_out, OctetUSequence& id_out)
   {
@@ -459,6 +459,7 @@
 
     return 1;
   }
+#endif
 
   static void print_tagged_components(std::stringstream& sstr,
                                       IOP::MultipleComponentProfile& components)

Modified: trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h	2018-01-25 02:43:28 UTC (rev 3206)
+++ trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h	2018-01-25 06:21:31 UTC (rev 3207)
@@ -84,12 +84,13 @@
    * @endif
    */
   std::string formatIORinfo(const char* iorstr);
-
+#if !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
   std::vector<IIOP::Address> getEndpoints(IOP::IOR& ior);
 
+
   void extractAddrs(IOP::MultipleComponentProfile& components,
                     std::vector<IIOP::Address>& addr);
+#endif
 
-
 }; // namespace CORBA_IORUtil
 #endif // CORBA_IORUTIL_H

Modified: trunk/OpenRTM-aist/src/lib/rtm/ConnectorListener.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ConnectorListener.h	2018-01-25 02:43:28 UTC (rev 3206)
+++ trunk/OpenRTM-aist/src/lib/rtm/ConnectorListener.h	2018-01-25 06:21:31 UTC (rev 3207)
@@ -1094,10 +1094,10 @@
             {
               cdrMemoryStream cdr;
 #ifdef ORB_IS_ORBEXPRESS
-			  cdr.cdr >> typeddata;
+			  cdr.cdr << typeddata;
 #elif defined(ORB_IS_TAO)
-			  TAO_InputCDR tao_cdr = TAO_InputCDR(cdr.cdr);
-			  tao_cdr >> typeddata;
+			  //TAO_InputCDR tao_cdr = TAO_InputCDR(cdr.cdr);
+			  cdr.cdr << typeddata;
 #else
               typeddata >>= cdr;
 #endif

Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrUDPConsumer.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrUDPConsumer.cpp	2018-01-25 02:43:28 UTC (rev 3206)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrUDPConsumer.cpp	2018-01-25 06:21:31 UTC (rev 3207)
@@ -73,7 +73,7 @@
    * @brief Write data into the buffer
    * @endif
    */
-  InPortConsumer::ReturnCode InPortCorbaCdrUDPConsumer::put(const cdrMemoryStream& data)
+  InPortConsumer::ReturnCode InPortCorbaCdrUDPConsumer::put(cdrMemoryStream& data)
   {
     RTC_PARANOID(("put()"));
 

Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrUDPConsumer.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrUDPConsumer.h	2018-01-25 02:43:28 UTC (rev 3206)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrUDPConsumer.h	2018-01-25 06:21:31 UTC (rev 3207)
@@ -154,7 +154,7 @@
      *
      * @endif
      */
-    virtual ReturnCode put(const cdrMemoryStream& data);
+    virtual ReturnCode put(cdrMemoryStream& data);
 
     /*!
      * @if jp

Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrUDPProvider.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrUDPProvider.h	2018-01-25 02:43:28 UTC (rev 3206)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrUDPProvider.h	2018-01-25 06:21:31 UTC (rev 3207)
@@ -259,7 +259,7 @@
      * @param data cdrMemoryStream
      * @endif
      */
-    inline void onBufferWrite(const cdrMemoryStream& data)
+    inline void onBufferWrite(cdrMemoryStream& data)
     {
       m_listeners->
         connectorData_[ON_BUFFER_WRITE].notify(m_profile, data);
@@ -274,7 +274,7 @@
      * @param data cdrMemoryStream
      * @endif
      */
-    inline void onBufferFull(const cdrMemoryStream& data)
+    inline void onBufferFull(cdrMemoryStream& data)
     {
       m_listeners->
         connectorData_[ON_BUFFER_FULL].notify(m_profile, data);
@@ -289,7 +289,7 @@
      * @param data cdrMemoryStream
      * @endif
      */
-    inline void onBufferWriteTimeout(const cdrMemoryStream& data)
+    inline void onBufferWriteTimeout(cdrMemoryStream& data)
     {
       m_listeners->
         connectorData_[ON_BUFFER_WRITE_TIMEOUT].notify(m_profile, data);
@@ -304,7 +304,7 @@
      * @param data cdrMemoryStream
      * @endif
      */
-    inline void onBufferWriteOverwrite(const cdrMemoryStream& data)
+    inline void onBufferWriteOverwrite(cdrMemoryStream& data)
     {
       m_listeners->
         connectorData_[ON_BUFFER_OVERWRITE].notify(m_profile, data);
@@ -319,7 +319,7 @@
      * @param data cdrMemoryStream
      * @endif
      */
-    inline void onReceived(const cdrMemoryStream& data)
+    inline void onReceived(cdrMemoryStream& data)
     {
       m_listeners->
         connectorData_[ON_RECEIVED].notify(m_profile, data);
@@ -334,7 +334,7 @@
      * @param data cdrMemoryStream
      * @endif
      */
-    inline void onReceiverFull(const cdrMemoryStream& data)
+    inline void onReceiverFull(cdrMemoryStream& data)
     {
       m_listeners->
         connectorData_[ON_RECEIVER_FULL].notify(m_profile, data);
@@ -347,7 +347,7 @@
      * @brief Notify an ON_RECEIVER_TIMEOUT event to listeners
      * @endif
      */
-    inline void onReceiverTimeout(const cdrMemoryStream& data)
+    inline void onReceiverTimeout(cdrMemoryStream& data)
     {
       m_listeners->
         connectorData_[ON_RECEIVER_TIMEOUT].notify(m_profile, data);
@@ -360,7 +360,7 @@
      * @Brief Notify an ON_RECEIVER_ERROR event to listeners
      * @endif
      */
-    inline void onReceiverError(const cdrMemoryStream& data)
+    inline void onReceiverError(cdrMemoryStream& data)
     {
       m_listeners->
         connectorData_[ON_RECEIVER_ERROR].notify(m_profile, data);

Modified: trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp	2018-01-25 02:43:28 UTC (rev 3206)
+++ trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp	2018-01-25 06:21:31 UTC (rev 3207)
@@ -2480,6 +2480,7 @@
    */
   void Manager::setEndpointProperty(CORBA::Object_ptr objref)
   {
+#if !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
     RTC_TRACE(("sedEndpointProperty()"));
     if (CORBA::is_nil(objref))
       {
@@ -2533,6 +2534,7 @@
     m_config.setProperty("corba.endpoints", coil::flatten(epstr));
     m_config.setProperty("corba.endpoints_ipv4", coil::flatten(epstr_ipv4));
     m_config.setProperty("corba.endpoints_ipv6", coil::flatten(epstr_ipv6));
+#endif
   }
 
   /*!

More information about the openrtm-commit mailing list