[openrtm-commit:03103] r3185 - branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-01-23 09:38:28 +0900 (Tue, 23 Jan 2018)
New Revision: 3185

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

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CorbaNaming.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CorbaNaming.cpp	2018-01-23 00:15:43 UTC (rev 3184)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CorbaNaming.cpp	2018-01-23 00:38:28 UTC (rev 3185)
@@ -35,7 +35,7 @@
    * @endif
    */
   CorbaNaming::CorbaNaming(CORBA::ORB_ptr orb)
-    : m_varORB(orb), m_nameServer(""),
+    : m_ptrORB(orb), m_nameServer(""),
       m_rootContext(CosNaming::NamingContextExt::_nil()),
       m_blLength(100)
   {
@@ -49,7 +49,7 @@
    * @endif
    */
   CorbaNaming::CorbaNaming(CORBA::ORB_ptr orb, const char* name_server)
-    : m_varORB(orb), m_nameServer(name_server),
+    : m_ptrORB(orb), m_nameServer(name_server),
       m_rootContext(CosNaming::NamingContextExt::_nil()),
       m_blLength(100)
   {
@@ -57,7 +57,7 @@
     m_nameServer = "corbaloc::" + m_nameServer + "/NameService";
     try
       {
-        obj = m_varORB->string_to_object(m_nameServer.c_str());
+        obj = m_ptrORB->string_to_object(m_nameServer.c_str());
         m_rootContext = CosNaming::NamingContextExt::_narrow(obj);
         if (CORBA::is_nil(m_rootContext)) throw std::bad_alloc();
       }
@@ -79,7 +79,7 @@
     m_nameServer = name_server;
     m_nameServer = "corbaloc::" + m_nameServer + "/NameService";
     CORBA::Object_var obj;
-    obj = m_varORB->string_to_object(m_nameServer.c_str());
+    obj = m_ptrORB->string_to_object(m_nameServer.c_str());
     m_rootContext = CosNaming::NamingContextExt::_narrow(obj);
     if (CORBA::is_nil(m_rootContext)) throw std::bad_alloc();
   }

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CorbaNaming.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CorbaNaming.h	2018-01-23 00:15:43 UTC (rev 3184)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CorbaNaming.h	2018-01-23 00:38:28 UTC (rev 3185)
@@ -1681,7 +1681,7 @@
      * @brief ORB
      * @endif
      */
-    CORBA::ORB_var m_varORB;
+    CORBA::ORB_ptr m_ptrORB;
     
     /*!
      * @if jp

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/NamingManager.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/NamingManager.cpp	2018-01-23 00:15:43 UTC (rev 3184)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/NamingManager.cpp	2018-01-23 00:38:28 UTC (rev 3185)
@@ -284,7 +284,7 @@
 					  }
 					  else
 					  {
-						  CORBA::ORB_ptr orb = Manager::instance().getORB();
+						  CORBA::ORB_var orb = Manager::instance().getORB();
 						  
 						  cns = RTC::CorbaNaming(orb, host.c_str());
 					  }