[openrtm-commit:02647] r3004 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-06-19 19:52:34 +0900 (Mon, 19 Jun 2017)
New Revision: 3004

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp
   trunk/OpenRTM-aist/src/lib/rtm/CorbaPort.h
   trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
   trunk/OpenRTM-aist/src/lib/rtm/RTObject.cpp
Log:
[compat, VxWorks] 

Modified: trunk/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp	2017-06-15 08:05:24 UTC (rev 3003)
+++ trunk/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp	2017-06-19 10:52:34 UTC (rev 3004)
@@ -91,11 +91,7 @@
   bool
   CorbaPort::registerProvider(const char* instance_name,
 			      const char* type_name,
-#ifdef ORB_IS_ORBEXPRESS
-			      PortableServer::ServantBase& provider)
-#else
 			      PortableServer::RefCountServantBase& provider)
-#endif
   {
     RTC_TRACE(("registerProvider(instance=%s, type_name=%s)",
                instance_name, type_name));

Modified: trunk/OpenRTM-aist/src/lib/rtm/CorbaPort.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CorbaPort.h	2017-06-15 08:05:24 UTC (rev 3003)
+++ trunk/OpenRTM-aist/src/lib/rtm/CorbaPort.h	2017-06-19 10:52:34 UTC (rev 3004)
@@ -730,11 +730,7 @@
      * @endif
      */
     bool registerProvider(const char* instance_name, const char* type_name,
-#ifdef ORB_IS_ORBEXPRESS
-                          PortableServer::ServantBase& provider);
-#else
                           PortableServer::RefCountServantBase& provider);
-#endif
     
     /*!
      * @if jp
@@ -1223,11 +1219,7 @@
     public:
       CorbaProviderHolder(const char* type_name,
                           const char* instance_name,
-#ifdef ORB_IS_ORBEXPRESS
-                          PortableServer::ServantBase* servant)
-#else
                           PortableServer::RefCountServantBase* servant)
-#endif
         : m_typeName(type_name),
           m_instanceName(instance_name),
           m_servant(servant),
@@ -1301,11 +1293,7 @@
     private:
       std::string m_typeName;
       std::string m_instanceName;
-#ifdef ORB_IS_ORBEXPRESS
-      PortableServer::ServantBase* m_servant;
-#else
       PortableServer::RefCountServantBase* m_servant;
-#endif
       PortableServer::ObjectId_var m_oid;
       std::string m_ior;
     };

Modified: trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp	2017-06-15 08:05:24 UTC (rev 3003)
+++ trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp	2017-06-19 10:52:34 UTC (rev 3004)
@@ -2051,13 +2051,8 @@
     for (CORBA::ULong i(0), len(m_ecs.size()); i < len; ++i)
       {
 	try{
-#ifdef ORB_IS_ORBEXPRESS
-      PortableServer::ServantBase* servant;
-      servant = dynamic_cast<PortableServer::ServantBase*>(m_ecs[i]);
-#else
       PortableServer::RefCountServantBase* servant;
       servant = dynamic_cast<PortableServer::RefCountServantBase*>(m_ecs[i]);
-#endif
       if (servant == NULL)
         {
           RTC_ERROR(("Invalid dynamic cast. EC->RefCountServantBase failed."));

Modified: trunk/OpenRTM-aist/src/lib/rtm/RTObject.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/RTObject.cpp	2017-06-15 08:05:24 UTC (rev 3003)
+++ trunk/OpenRTM-aist/src/lib/rtm/RTObject.cpp	2017-06-19 10:52:34 UTC (rev 3004)
@@ -2141,15 +2141,9 @@
         m_eclist[i]->getObjRef()->stop();
         try
           {
-#ifdef ORB_IS_ORBEXPRESS
-            PortableServer::ServantBase* servant(NULL);
-            servant =
-              dynamic_cast<PortableServer::ServantBase*>(m_eclist[i]);
-#else
             PortableServer::RefCountServantBase* servant(NULL);
             servant =
               dynamic_cast<PortableServer::RefCountServantBase*>(m_eclist[i]);
-#endif
             if (servant == NULL)
               {
                 RTC_ERROR(("Dynamic cast error: ECBase -> Servant."));