[openrtm-commit:02620] r2997 - in trunk/OpenRTM-aist/src/lib: . rtm
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 5月 31日 (水) 14:08:08 JST
Author: miyamoto
Date: 2017-05-31 14:08:08 +0900 (Wed, 31 May 2017)
New Revision: 2997
Added:
trunk/OpenRTM-aist/src/lib/CMakeLists.txt
Modified:
trunk/OpenRTM-aist/src/lib/rtm/CORBA_SeqUtil.h
trunk/OpenRTM-aist/src/lib/rtm/CorbaConsumer.h
trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.cpp
trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.h
trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.cpp
trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.h
trunk/OpenRTM-aist/src/lib/rtm/InPortConsumer.h
trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp
trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.h
trunk/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.cpp
trunk/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.h
trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.h
trunk/OpenRTM-aist/src/lib/rtm/NamingManager.cpp
trunk/OpenRTM-aist/src/lib/rtm/NamingManager.h
trunk/OpenRTM-aist/src/lib/rtm/OutPortConnector.h
trunk/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.cpp
trunk/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.h
trunk/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp
trunk/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.h
trunk/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
trunk/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp
trunk/OpenRTM-aist/src/lib/rtm/PortAdmin.h
trunk/OpenRTM-aist/src/lib/rtm/PortBase.cpp
trunk/OpenRTM-aist/src/lib/rtm/PortBase.h
trunk/OpenRTM-aist/src/lib/rtm/PublisherBase.h
trunk/OpenRTM-aist/src/lib/rtm/PublisherFlush.cpp
trunk/OpenRTM-aist/src/lib/rtm/PublisherFlush.h
trunk/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp
trunk/OpenRTM-aist/src/lib/rtm/PublisherNew.h
trunk/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp
trunk/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.h
trunk/OpenRTM-aist/src/lib/rtm/RTObject.cpp
trunk/OpenRTM-aist/src/lib/rtm/RTObject.h
trunk/OpenRTM-aist/src/lib/rtm/SdoConfiguration.h
trunk/OpenRTM-aist/src/lib/rtm/SdoOrganization.h
Log:
[incompat, VxWorks] add "typedef CORBA::Stream cdrMemoryStream;"
Added: trunk/OpenRTM-aist/src/lib/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/CMakeLists.txt (rev 0)
+++ trunk/OpenRTM-aist/src/lib/CMakeLists.txt 2017-05-31 05:08:08 UTC (rev 2997)
@@ -0,0 +1,5 @@
+cmake_minimum_required (VERSION 2.6)
+
+add_subdirectory(coil)
+add_subdirectory(rtm)
+
Modified: trunk/OpenRTM-aist/src/lib/rtm/CORBA_SeqUtil.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CORBA_SeqUtil.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/CORBA_SeqUtil.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -139,11 +139,7 @@
* @endif
*/
template <class CorbaSequence, class Functor>
-#ifdef ORB_IS_ORBEXPRESS
- CORBA::Long find(CorbaSequence& seq, Functor f)
-#else
CORBA::Long find(const CorbaSequence& seq, Functor f)
-#endif
{
CORBA::ULong len(seq.length());
for (CORBA::ULong i = 0; i < len; ++i)
Modified: trunk/OpenRTM-aist/src/lib/rtm/CorbaConsumer.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CorbaConsumer.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/CorbaConsumer.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -122,12 +122,12 @@
*
* @endif
*/
+ CorbaConsumerBase(const CorbaConsumerBase& x)
#ifdef ORB_IS_ORBEXPRESS
- CorbaConsumerBase(CorbaConsumerBase& x)
+ : m_objref(CORBA::Object::_duplicate(x.m_objref.in()))
#else
- CorbaConsumerBase(const CorbaConsumerBase& x)
+ : m_objref(CORBA::Object::_duplicate(x.m_objref))
#endif
- : m_objref(CORBA::Object::_duplicate(x.m_objref))
{
}
@@ -150,11 +150,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- CorbaConsumerBase& operator=(CorbaConsumerBase& x)
-#else
CorbaConsumerBase& operator=(const CorbaConsumerBase& x)
-#endif
{
CorbaConsumerBase tmp(x);
tmp.swap(*this);
@@ -375,12 +371,12 @@
*
* @endif
*/
+ CorbaConsumer(const CorbaConsumer& x)
#ifdef ORB_IS_ORBEXPRESS
- CorbaConsumer(CorbaConsumer& x)
+ : m_var(ObjectType::_duplicate(x.m_var.in()))
#else
- CorbaConsumer(const CorbaConsumer& x)
+ : m_var(ObjectType::_duplicate(x.m_var))
#endif
- : m_var(ObjectType::_duplicate(x.m_var))
{
}
@@ -403,11 +399,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- CorbaConsumer& operator=(CorbaConsumer& x)
-#else
CorbaConsumer& operator=(const CorbaConsumer& x)
-#endif
{
CorbaConsumer tmp(x);
tmp.swap(*this);
Modified: trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.cpp 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.cpp 2017-05-31 05:08:08 UTC (rev 2997)
@@ -719,11 +719,7 @@
* @brief Getting object reference
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- RTC::ExecutionContextService_ptr ExecutionContextBase::getObjRef(void)
-#else
RTC::ExecutionContextService_ptr ExecutionContextBase::getObjRef(void) const
-#endif
{
return m_profile.getObjRef();
}
@@ -772,11 +768,7 @@
* @brief Getting a reference of the owner component
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- const RTC::RTObject_ptr ExecutionContextBase::getOwner()
-#else
const RTC::RTObject_ptr ExecutionContextBase::getOwner() const
-#endif
{
return m_profile.getOwner();
}
Modified: trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -863,11 +863,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- RTC::ExecutionContextService_ptr getObjRef(void);
-#else
RTC::ExecutionContextService_ptr getObjRef(void) const;
-#endif
/*!
* @if jp
@@ -948,11 +944,7 @@
* @return a reference of the owner RT-Component
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- const RTC::RTObject_ptr getOwner();
-#else
const RTC::RTObject_ptr getOwner() const;
-#endif
/*!
* @if jp
Modified: trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.cpp 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.cpp 2017-05-31 05:08:08 UTC (rev 2997)
@@ -92,15 +92,15 @@
* @endif
*/
RTC::ExecutionContextService_ptr
-#ifdef ORB_IS_ORBEXPRESS
- ExecutionContextProfile::getObjRef(void)
-#else
ExecutionContextProfile::getObjRef(void) const
-#endif
{
RTC_TRACE(("getObjRef()"));
Guard guard(m_profileMutex);
+#ifdef ORB_IS_ORBEXPRESS
+ return RTC::ExecutionContextService::_duplicate(m_ref.in());
+#else
return RTC::ExecutionContextService::_duplicate(m_ref);
+#endif
}
/*!
@@ -244,15 +244,15 @@
* @brief Getting a reference of the owner component
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- const RTC::RTObject_ptr ExecutionContextProfile::getOwner()
-#else
const RTC::RTObject_ptr ExecutionContextProfile::getOwner() const
-#endif
{
RTC_TRACE(("getOwner()"));
Guard guard(m_profileMutex);
+#ifdef ORB_IS_ORBEXPRESS
+ return RTC::RTObject::_duplicate(m_profile.owner.in());
+#else
return RTC::RTObject::_duplicate(m_profile.owner);
+#endif
}
/*!
Modified: trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -137,11 +137,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- RTC::ExecutionContextService_ptr getObjRef(void);
-#else
RTC::ExecutionContextService_ptr getObjRef(void) const;
-#endif
/*!
* @if jp
@@ -307,11 +303,7 @@
* @return a reference of the owner RT-Component
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- const RTC::RTObject_ptr getOwner();
-#else
const RTC::RTObject_ptr getOwner() const;
-#endif
/*!
* @if jp
@@ -578,10 +570,17 @@
public:
find_participant(RTC::RTObject_ptr comp)
: m_comp(RTC::RTObject::_duplicate(comp)) {}
+#ifdef ORB_IS_ORBEXPRESS
+ bool operator()(RTC::RTObject_var comp)
+ {
+ return m_comp->_is_equivalent(comp.in());
+ }
+#else
bool operator()(RTC::RTObject_ptr comp)
{
return m_comp->_is_equivalent(comp);
}
+#endif
};
}; // class ExecutionContextProfile
}; // namespace RTC
Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortConsumer.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortConsumer.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortConsumer.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -149,11 +149,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- virtual ReturnCode put(CORBA::Stream& data) = 0;
-#else
virtual ReturnCode put(const cdrMemoryStream& data) = 0;
-#endif
/*!
* @if jp
Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp 2017-05-31 05:08:08 UTC (rev 2997)
@@ -66,12 +66,7 @@
* @brief Write data into the buffer
* @endif
*/
- InPortConsumer::ReturnCode InPortCorbaCdrConsumer::
-#ifdef ORB_IS_ORBEXPRESS
- put(CORBA::Stream& data)
-#else
- put(const cdrMemoryStream& data)
-#endif
+ InPortConsumer::ReturnCode InPortCorbaCdrConsumer::put(const cdrMemoryStream& data)
{
RTC_PARANOID(("put()"));
@@ -78,8 +73,9 @@
#ifndef ORB_IS_RTORB
#ifdef ORB_IS_ORBEXPRESS
CORBA::Octet* to;
- *static_cast<CORBA::Octet*>(to) = data.read_octet();
- ::OpenRTM::CdrData tmp(data.size_written(), data.size_written(),
+ cdrMemoryStream data_tmp = data;
+ *static_cast<CORBA::Octet*>(to) = data_tmp.read_octet();
+ ::OpenRTM::CdrData tmp(data_tmp.size_written(), data_tmp.size_written(),
to, 0);
#else
::OpenRTM::CdrData tmp(data.bufSize(), data.bufSize(),
Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -155,11 +155,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- virtual ReturnCode put(CORBA::Stream& data);
-#else
virtual ReturnCode put(const cdrMemoryStream& data);
-#endif
/*!
* @if jp
Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.cpp 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.cpp 2017-05-31 05:08:08 UTC (rev 2997)
@@ -66,12 +66,7 @@
* @brief Write data into the buffer
* @endif
*/
- InPortConsumer::ReturnCode InPortDirectConsumer::
-#ifdef ORB_IS_ORBEXPRESS
- put(CORBA::Stream& data)
-#else
- put(const cdrMemoryStream& data)
-#endif
+ InPortConsumer::ReturnCode InPortDirectConsumer::put(const cdrMemoryStream& data)
{
RTC_PARANOID(("put(): never called."));
return UNKNOWN_ERROR;
Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -154,11 +154,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- virtual ReturnCode put(CORBA::Stream& data);
-#else
virtual ReturnCode put(const cdrMemoryStream& data);
-#endif
/*!
* @if jp
Modified: trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp 2017-05-31 05:08:08 UTC (rev 2997)
@@ -501,13 +501,8 @@
if (comp == NULL)
{ RTC_ERROR(("%s not found.", comps[i].c_str())); continue; }
-#ifdef ORB_IS_ORBEXPRESS
- ExecutionContextList* ecs = comp->get_owned_contexts();
- (*ecs)[0]->activate_component(comp->getObjRef());
-#else
ExecutionContextList_var ecs = comp->get_owned_contexts();
- ecs[0]->activate_component(comp->getObjRef());
-#endif
+ ecs[CORBA::ULong(0)]->activate_component(comp->getObjRef());
}
} // end of pre-activation
return true;
Modified: trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp 2017-05-31 05:08:08 UTC (rev 2997)
@@ -820,13 +820,13 @@
* @brief Get the reference of Manager.
* @endif
*/
+ RTM::Manager_ptr ManagerServant::getObjRef() const
+ {
#ifdef ORB_IS_ORBEXPRESS
- RTM::Manager_ptr ManagerServant::getObjRef()
+ return m_objref.in();
#else
- RTM::Manager_ptr ManagerServant::getObjRef() const
+ return m_objref;
#endif
- {
- return m_objref;
}
/*!
Modified: trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -566,11 +566,7 @@
* @return Manager reference
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- RTM::Manager_ptr getObjRef();
-#else
RTM::Manager_ptr getObjRef() const;
-#endif
/*!
* @if jp
@@ -779,14 +775,23 @@
{
RTM::Manager_var m_mgr;
public:
+
is_equiv(RTM::Manager_ptr mgr)
: m_mgr(RTM::Manager::_duplicate(mgr)) {}
+#ifdef ORB_IS_ORBEXPRESS
+ bool operator()(RTM::Manager_var mgr)
+ {
+ return m_mgr->_is_equivalent(mgr.in());
+ }
+#else
bool operator()(RTM::Manager_ptr mgr)
{
return m_mgr->_is_equivalent(mgr);
}
+#endif
};
+
};
}; // namespace RTM
#endif // RTM_MANAGERSERVANT_H
Modified: trunk/OpenRTM-aist/src/lib/rtm/NamingManager.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/NamingManager.cpp 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/NamingManager.cpp 2017-05-31 05:08:08 UTC (rev 2997)
@@ -69,11 +69,7 @@
* @endif
*/
void NamingOnCorba::bindObject(const char* name,
-#ifdef ORB_IS_ORBEXPRESS
- RTObject_impl* rtobj)
-#else
const RTObject_impl* rtobj)
-#endif
{
RTC_TRACE(("bindObject(name = %s, rtobj)", name));
#ifdef ORB_IS_OMNIORB
@@ -104,11 +100,7 @@
}
void NamingOnCorba::bindObject(const char* name,
-#ifdef ORB_IS_ORBEXPRESS
- PortBase* port)
-#else
const PortBase* port)
-#endif
{
RTC_TRACE(("bindObject(name = %s, rtobj)", name));
#ifdef ORB_IS_OMNIORB
@@ -139,11 +131,7 @@
}
void NamingOnCorba::bindObject(const char* name,
-#ifdef ORB_IS_ORBEXPRESS
- RTM::ManagerServant* mgr)
-#else
const RTM::ManagerServant* mgr)
-#endif
{
RTC_TRACE(("bindObject(name = %s, mgr)", name));
#ifdef ORB_IS_OMNIORB
@@ -246,11 +234,7 @@
* @endif
*/
void NamingManager::bindObject(const char* name,
-#ifdef ORB_IS_ORBEXPRESS
- RTObject_impl* rtobj)
-#else
const RTObject_impl* rtobj)
-#endif
{
RTC_TRACE(("NamingManager::bindObject(%s)", name));
@@ -273,11 +257,7 @@
registerCompName(name, rtobj);
}
void NamingManager::bindObject(const char* name,
-#ifdef ORB_IS_ORBEXPRESS
- PortBase* port)
-#else
const PortBase* port)
-#endif
{
RTC_TRACE(("NamingManager::bindObject(%s)", name));
@@ -300,11 +280,7 @@
registerPortName(name, port);
}
void NamingManager::bindObject(const char* name,
-#ifdef ORB_IS_ORBEXPRESS
- RTM::ManagerServant* mgr)
-#else
const RTM::ManagerServant* mgr)
-#endif
{
RTC_TRACE(("NamingManager::bindObject(%s)", name));
@@ -518,11 +494,7 @@
* @endif
*/
void NamingManager::registerCompName(const char* name,
-#ifdef ORB_IS_ORBEXPRESS
- RTObject_impl* rtobj)
-#else
const RTObject_impl* rtobj)
-#endif
{
for (int i(0), len(m_compNames.size()); i < len; ++i)
{
Modified: trunk/OpenRTM-aist/src/lib/rtm/NamingManager.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/NamingManager.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/NamingManager.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -109,14 +109,8 @@
*
* @endif
*/
-
-#ifdef ORB_IS_ORBEXPRESS
- virtual void bindObject(const char* name, PortBase* port) = 0;
- virtual void bindObject(const char* name, RTObject_impl* rtobj) = 0;
-#else
virtual void bindObject(const char* name, const PortBase* port) = 0;
virtual void bindObject(const char* name, const RTObject_impl* rtobj) = 0;
-#endif
/*!
* @if jp
@@ -139,11 +133,7 @@
virtual void bindObject(const char* name,
-#ifdef ORB_IS_ORBEXPRESS
- RTM::ManagerServant* mgr) = 0;
-#else
const RTM::ManagerServant* mgr) = 0;
-#endif
/*!
* @if jp
@@ -298,14 +288,8 @@
*
* @endif
*/
-
-#ifdef ORB_IS_ORBEXPRESS
- virtual void bindObject(const char* name, RTObject_impl* rtobj);
- virtual void bindObject(const char* name, PortBase* port);
-#else
virtual void bindObject(const char* name, const RTObject_impl* rtobj);
virtual void bindObject(const char* name, const PortBase* port);
-#endif
/*!
* @if jp
@@ -324,11 +308,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- virtual void bindObject(const char* name, RTM::ManagerServant* mgr);
-#else
virtual void bindObject(const char* name, const RTM::ManagerServant* mgr);
-#endif
/*!
* @if jp
@@ -486,14 +466,8 @@
*
* @endif
*/
-
-#ifdef ORB_IS_ORBEXPRESS
- void bindObject(const char* name, PortBase* port);
- void bindObject(const char* name, RTObject_impl* rtobj);
-#else
void bindObject(const char* name, const PortBase* port);
void bindObject(const char* name, const RTObject_impl* rtobj);
-#endif
/*!
* @if jp
@@ -518,11 +492,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- void bindObject(const char* name, RTM::ManagerServant* mgr);
-#else
void bindObject(const char* name, const RTM::ManagerServant* mgr);
-#endif
/*!
* @if jp
@@ -672,11 +642,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- void registerCompName(const char* name, RTObject_impl* rtobj);
-#else
void registerCompName(const char* name, const RTObject_impl* rtobj);
-#endif
/*!
* @if jp
@@ -819,19 +785,11 @@
*/
struct Comps
{
-#ifdef ORB_IS_ORBEXPRESS
- Comps(const char* n, RTObject_impl* obj)
-#else
Comps(const char* n, const RTObject_impl* obj)
-#endif
: name(n), rtobj(obj)
{}
std::string name;
-#ifdef ORB_IS_ORBEXPRESS
- RTObject_impl* rtobj;
-#else
const RTObject_impl* rtobj;
-#endif
};
/*!
* @if jp
Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPortConnector.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPortConnector.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPortConnector.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -159,11 +159,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- virtual ReturnCode write(CORBA::Stream& data) = 0;
-#else
virtual ReturnCode write(const cdrMemoryStream& data) = 0;
-#endif
/*!
* @if jp
@@ -312,6 +308,7 @@
*/
cdrMemoryStream m_cdr;
+
/*!
* @if jp
* @brief Ʊ°ì¥×¥í¥»¥¹¾å¤Î¥Ô¥¢InPort¤Î¥Ý¥¤¥ó¥¿
Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.cpp 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.cpp 2017-05-31 05:08:08 UTC (rev 2997)
@@ -76,11 +76,7 @@
* @endif
*/
ConnectorBase::ReturnCode
-#ifdef ORB_IS_ORBEXPRESS
- OutPortPullConnector::write(CORBA::Stream& data)
-#else
OutPortPullConnector::write(const cdrMemoryStream& data)
-#endif
{
m_buffer->write(data);
return PORT_OK;
Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -162,11 +162,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- virtual ReturnCode write(CORBA::Stream& data);
-#else
virtual ReturnCode write(const cdrMemoryStream& data);
-#endif
/*!
* @if jp
Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp 2017-05-31 05:08:08 UTC (rev 2997)
@@ -83,11 +83,7 @@
* @endif
*/
ConnectorBase::ReturnCode
-#ifdef ORB_IS_ORBEXPRESS
- OutPortPushConnector::write(CORBA::Stream& data)
-#else
OutPortPushConnector::write(const cdrMemoryStream& data)
-#endif
{
RTC_TRACE(("write()"));
#ifdef ORB_IS_ORBEXPRESS
Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -189,11 +189,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- virtual ReturnCode write(CORBA::Stream& data);
-#else
virtual ReturnCode write(const cdrMemoryStream& data);
-#endif
/*!
* @if jp
Modified: trunk/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp 2017-05-31 05:08:08 UTC (rev 2997)
@@ -321,22 +321,10 @@
{
if (::CORBA::is_nil(m_ec))
{
-#ifdef ORB_IS_ORBEXPRESS
- ::RTC::ExecutionContextList* ecs(m_rtobj->get_owned_contexts());
- if (ecs->length() > 0)
- {
- m_ec = (*ecs)[0];
- }
- else
- {
- return;
- }
- }
-#else
::RTC::ExecutionContextList_var ecs(m_rtobj->get_owned_contexts());
if (ecs->length() > 0)
{
- m_ec = ecs[0];
+ m_ec = ecs[CORBA::ULong(0)];
}
else
{
@@ -343,8 +331,8 @@
return;
}
}
-#endif
+
// set ec to target RTC
m_ec->add_component(member.rtobj_.in());
@@ -380,15 +368,9 @@
{
if (::CORBA::is_nil(m_ec))
{
-#ifdef ORB_IS_ORBEXPRESS
- ::RTC::ExecutionContextList* ecs(m_rtobj->get_owned_contexts());
- if (ecs->length() == 0)
- {
- RTC_FATAL(("no owned EC"));
- return;
- }
- m_ec = (*ecs)[0];
-#else
+
+
+
::RTC::ExecutionContextList_var ecs(m_rtobj->get_owned_contexts());
if (ecs->length() == 0)
{
@@ -395,8 +377,7 @@
RTC_FATAL(("no owned EC"));
return;
}
- m_ec = ecs[0];
-#endif
+ m_ec = ecs[CORBA::ULong(0)];
}
m_ec->remove_component(member.rtobj_.in());
@@ -720,21 +701,13 @@
ReturnCode_t PeriodicECSharedComposite::onActivated(RTC::UniqueId exec_handle)
{
RTC_TRACE(("onActivated(%d)", exec_handle));
-#ifdef ORB_IS_ORBEXPRESS
- ::RTC::ExecutionContextList* ecs(get_owned_contexts());
-#else
::RTC::ExecutionContextList_var ecs(get_owned_contexts());
-#endif
::SDOPackage::SDOList_var sdos(m_org->get_members());
for (::CORBA::ULong i(0), len(sdos->length()); i < len; ++i)
{
::RTC::RTObject_var rtc(::RTC::RTObject::_narrow(sdos[i]));
-#ifdef ORB_IS_ORBEXPRESS
- (*ecs)[0]->activate_component(rtc.in());
-#else
- ecs[0]->activate_component(rtc.in());
-#endif
+ ecs[CORBA::ULong(0)]->activate_component(rtc.in());
}
RTC_DEBUG(("%d member RTC%s activated.", sdos->length(),
sdos->length() == 1 ? " was" : "s were"));
@@ -751,21 +724,13 @@
ReturnCode_t PeriodicECSharedComposite::onDeactivated(RTC::UniqueId exec_handle)
{
RTC_TRACE(("onDeactivated(%d)", exec_handle));
-#ifdef ORB_IS_ORBEXPRESS
- ::RTC::ExecutionContextList* ecs(get_owned_contexts());
-#else
::RTC::ExecutionContextList_var ecs(get_owned_contexts());
-#endif
::SDOPackage::SDOList_var sdos(m_org->get_members());
for (::CORBA::ULong i(0), len(sdos->length()); i < len; ++i)
{
::RTC::RTObject_var rtc(::RTC::RTObject::_narrow(sdos[i]));
-#ifdef ORB_IS_ORBEXPRESS
- (*ecs)[0]->deactivate_component(rtc.in());
-#else
- ecs[0]->deactivate_component(rtc.in());
-#endif
+ ecs[CORBA::ULong(0)]->deactivate_component(rtc.in());
}
return ::RTC::RTC_OK;
}
@@ -780,21 +745,13 @@
ReturnCode_t PeriodicECSharedComposite::onReset(RTC::UniqueId exec_handle)
{
RTC_TRACE(("onReset(%d)", exec_handle));
-#ifdef ORB_IS_ORBEXPRESS
- ::RTC::ExecutionContextList* ecs(get_owned_contexts());
-#else
::RTC::ExecutionContextList_var ecs(get_owned_contexts());
-#endif
::SDOPackage::SDOList_var sdos(m_org->get_members());
for (::CORBA::ULong i(0), len(sdos->length()); i < len; ++i)
{
::RTC::RTObject_var rtc(::RTC::RTObject::_narrow(sdos[i]));
-#ifdef ORB_IS_ORBEXPRESS
- (*ecs)[0]->reset_component(rtc.in());
-#else
- ecs[0]->reset_component(rtc.in());
-#endif
+ ecs[CORBA::ULong(0)]->reset_component(rtc.in());
}
return ::RTC::RTC_OK;
}
Modified: trunk/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp 2017-05-31 05:08:08 UTC (rev 2997)
@@ -33,7 +33,11 @@
struct PortAdmin::find_port_name
{
find_port_name(const char* name) : m_name(name) {};
+#ifdef ORB_IS_ORBEXPRESS
+ bool operator()(const PortService_var& p)
+#else
bool operator()(const PortService_ptr& p)
+#endif
{
try
{
@@ -60,9 +64,15 @@
struct PortAdmin::find_port
{
find_port(const PortService_ptr& p) : m_port(p) {};
+#ifdef ORB_IS_ORBEXPRESS
+ bool operator()(const PortService_var& p)
+ {
+ return m_port->_is_equivalent(p.in());
+#else
bool operator()(const PortService_ptr& p)
{
return m_port->_is_equivalent(p);
+#endif
}
const PortService_ptr m_port;
};
@@ -119,11 +129,7 @@
* @brief Get PortProfileList
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- PortProfileList PortAdmin::getPortProfileList()
-#else
PortProfileList PortAdmin::getPortProfileList() const
-#endif
{
#ifndef ORB_IS_RTORB
@@ -162,17 +168,17 @@
* @brief Get the reference to the Port's object
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- PortService_ptr PortAdmin::getPortRef(const char* port_name)
-#else
PortService_ptr PortAdmin::getPortRef(const char* port_name) const
-#endif
{
CORBA::Long index;
index = CORBA_SeqUtil::find(m_portRefs, find_port_name(port_name));
if (index >= 0)
{//throw NotFound(port_name);
+#ifdef ORB_IS_ORBEXPRESS
+ return m_portRefs[index].in();
+#else
return m_portRefs[index];
+#endif
}
return RTC::PortService::_nil();
}
Modified: trunk/OpenRTM-aist/src/lib/rtm/PortAdmin.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/PortAdmin.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/PortAdmin.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -130,11 +130,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- PortProfileList getPortProfileList();
-#else
PortProfileList getPortProfileList() const;
-#endif
/*!
* @if jp
@@ -162,11 +158,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- PortService_ptr getPortRef(const char* port_name);
-#else
PortService_ptr getPortRef(const char* port_name) const;
-#endif
/*!
* @if jp
@@ -569,11 +561,7 @@
{
public:
port_prof_collect(PortProfileList& p) : m_p(p) {}
-#ifdef ORB_IS_ORBEXPRESS
- void operator()(PortBase* port)
-#else
void operator()(const PortBase* port)
-#endif
{
CORBA_SeqUtil::push_back(m_p, port->getPortProfile());
}
@@ -593,7 +581,7 @@
public:
port_prof_collect2(PortProfileList& p) : m_p(p) {}
#ifdef ORB_IS_ORBEXPRESS
- void operator()(PortService_ptr port)
+ void operator()(const PortService_var port)
#else
void operator()(const PortService_ptr port)
#endif
Modified: trunk/OpenRTM-aist/src/lib/rtm/PortBase.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/PortBase.cpp 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/PortBase.cpp 2017-05-31 05:08:08 UTC (rev 2997)
@@ -554,15 +554,15 @@
* @brief Get the object reference of the Port
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- PortService_ptr PortBase::getPortRef()
-#else
PortService_ptr PortBase::getPortRef() const
-#endif
{
RTC_TRACE(("getPortRef()"));
Guard gurad(m_profile_mutex);
+#ifdef ORB_IS_ORBEXPRESS
+ return m_profile.port_ref.in();
+#else
return m_profile.port_ref;
+#endif
}
/*!
Modified: trunk/OpenRTM-aist/src/lib/rtm/PortBase.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/PortBase.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/PortBase.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -961,11 +961,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- PortService_ptr getPortRef();
-#else
PortService_ptr getPortRef() const;
-#endif
/*!
* @if jp
@@ -2244,10 +2240,17 @@
struct find_port_ref
{
find_port_ref(PortService_ptr port_ref) : m_port(port_ref) {};
+#ifdef ORB_IS_ORBEXPRESS
+ bool operator()(PortService_var port_ref)
+ {
+ return m_port->_is_equivalent(port_ref.in());
+ }
+#else
bool operator()(PortService_ptr port_ref)
{
return m_port->_is_equivalent(port_ref);
}
+#endif
PortService_ptr m_port;
}; // struct find_port_ref
Modified: trunk/OpenRTM-aist/src/lib/rtm/PublisherBase.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/PublisherBase.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/PublisherBase.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -253,11 +253,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- virtual ReturnCode write(CORBA::Stream& data,
-#else
virtual ReturnCode write(const cdrMemoryStream& data,
-#endif
unsigned long sec,
unsigned long usec) = 0;
Modified: trunk/OpenRTM-aist/src/lib/rtm/PublisherFlush.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/PublisherFlush.cpp 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/PublisherFlush.cpp 2017-05-31 05:08:08 UTC (rev 2997)
@@ -133,11 +133,7 @@
* @brief Write data
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- PublisherBase::ReturnCode PublisherFlush::write(CORBA::Stream& data,
-#else
PublisherBase::ReturnCode PublisherFlush::write(const cdrMemoryStream& data,
-#endif
unsigned long sec,
unsigned long usec)
{
Modified: trunk/OpenRTM-aist/src/lib/rtm/PublisherFlush.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/PublisherFlush.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/PublisherFlush.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -265,11 +265,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- virtual ReturnCode write(CORBA::Stream& data,
-#else
virtual ReturnCode write(const cdrMemoryStream& data,
-#endif
unsigned long sec,
unsigned long usec);
/*!
Modified: trunk/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp 2017-05-31 05:08:08 UTC (rev 2997)
@@ -162,11 +162,7 @@
* @brief Write data
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- PublisherBase::ReturnCode PublisherNew::write(CORBA::Stream& data,
-#else
PublisherBase::ReturnCode PublisherNew::write(const cdrMemoryStream& data,
-#endif
unsigned long sec,
unsigned long usec)
{
@@ -428,11 +424,8 @@
{
m_buffer->advanceRptr(postskip);
-#ifdef ORB_IS_ORBEXPRESS
- CORBA::Stream& cdr(m_buffer->get());
-#else
const cdrMemoryStream& cdr(m_buffer->get());
-#endif
+
onBufferRead(cdr);
onSend(cdr);
@@ -474,11 +467,7 @@
m_buffer->advanceRptr(m_buffer->readable() - 1);
-#ifdef ORB_IS_ORBEXPRESS
- CORBA::Stream& cdr(m_buffer->get());
-#else
cdrMemoryStream& cdr(m_buffer->get());
-#endif
onBufferRead(cdr);
onSend(cdr);
Modified: trunk/OpenRTM-aist/src/lib/rtm/PublisherNew.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/PublisherNew.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/PublisherNew.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -323,11 +323,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- virtual ReturnCode write(CORBA::Stream& data,
-#else
virtual ReturnCode write(const cdrMemoryStream& data,
-#endif
unsigned long sec,
unsigned long usec);
Modified: trunk/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp 2017-05-31 05:08:08 UTC (rev 2997)
@@ -170,11 +170,7 @@
* @endif
*/
PublisherBase::ReturnCode
-#ifdef ORB_IS_ORBEXPRESS
- PublisherPeriodic::write(CORBA::Stream& data,
-#else
PublisherPeriodic::write(const cdrMemoryStream& data,
-#endif
unsigned long sec,
unsigned long usec)
{
@@ -288,11 +284,7 @@
while (m_buffer->readable() > 0)
{
-#ifdef ORB_IS_ORBEXPRESS
- CORBA::Stream& cdr(m_buffer->get());
-#else
const cdrMemoryStream& cdr(m_buffer->get());
-#endif
onBufferRead(cdr);
onSend(cdr);
@@ -318,11 +310,7 @@
RTC_TRACE(("pushFifo()"));
if (bufferIsEmpty()) { return BUFFER_EMPTY; }
-#ifdef ORB_IS_ORBEXPRESS
- CORBA::Stream& cdr(m_buffer->get());
-#else
const cdrMemoryStream& cdr(m_buffer->get());
-#endif
onBufferRead(cdr);
onSend(cdr);
@@ -357,11 +345,7 @@
{
m_buffer->advanceRptr(postskip);
readable -= postskip;
-#ifdef ORB_IS_ORBEXPRESS
- CORBA::Stream& cdr(m_buffer->get());
-#else
const cdrMemoryStream& cdr(m_buffer->get());
-#endif
onBufferRead(cdr);
onSend(cdr);
@@ -396,11 +380,8 @@
m_readback = true;
m_buffer->advanceRptr(m_buffer->readable() - 1);
-#ifdef ORB_IS_ORBEXPRESS
- CORBA::Stream& cdr(m_buffer->get());
-#else
const cdrMemoryStream& cdr(m_buffer->get());
-#endif
+
onBufferRead(cdr);
onSend(cdr);
Modified: trunk/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -323,11 +323,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- virtual ReturnCode write(CORBA::Stream& data,
-#else
virtual ReturnCode write(const cdrMemoryStream& data,
-#endif
unsigned long sec,
unsigned long usec);
/*!
Modified: trunk/OpenRTM-aist/src/lib/rtm/RTObject.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2017-05-31 05:08:08 UTC (rev 2997)
@@ -1505,15 +1505,14 @@
* @brief [local interface] Get the object reference
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- RTObject_ptr RTObject_impl::getObjRef()
-#else
RTObject_ptr RTObject_impl::getObjRef() const
-#endif
{
RTC_TRACE(("getObjRef()"));
-
+#ifdef ORB_IS_ORBEXPRESS
+ return m_objref.in();
+#else
return m_objref;
+#endif
}
/*!
Modified: trunk/OpenRTM-aist/src/lib/rtm/RTObject.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/RTObject.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/RTObject.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -2163,11 +2163,7 @@
*
* @endif
*/
-#ifdef ORB_IS_ORBEXPRESS
- RTObject_ptr getObjRef();
-#else
RTObject_ptr getObjRef() const;
-#endif
/*!
* @if jp
@@ -4950,6 +4946,19 @@
: m_ec(ExecutionContext::_duplicate(ec))
{
}
+#ifdef ORB_IS_ORBEXPRESS
+ bool operator()(ExecutionContextService_var ecs)
+ {
+ try
+ {
+ if (!::CORBA::is_nil(ecs.in()))
+ {
+ ExecutionContext_var ec;
+ ec = ExecutionContext::_narrow(ecs.in());
+ return m_ec->_is_equivalent(ec);
+ }
+ }
+#else
bool operator()(ExecutionContextService_ptr ecs)
{
try
@@ -4961,6 +4970,7 @@
return m_ec->_is_equivalent(ec);
}
}
+#endif
catch (...)
{
return false;
Modified: trunk/OpenRTM-aist/src/lib/rtm/SdoConfiguration.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/SdoConfiguration.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/SdoConfiguration.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -1153,7 +1153,11 @@
struct org_id
{
org_id(const char* id) : m_id(id) {};
+#ifdef ORB_IS_ORBEXPRESS
+ bool operator()(const Organization_var& o)
+#else
bool operator()(const Organization_ptr& o)
+#endif
{
CORBA::String_var id(o->get_organization_id());
return m_id == (const char *)id;
Modified: trunk/OpenRTM-aist/src/lib/rtm/SdoOrganization.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/SdoOrganization.h 2017-05-31 02:13:29 UTC (rev 2996)
+++ trunk/OpenRTM-aist/src/lib/rtm/SdoOrganization.h 2017-05-31 05:08:08 UTC (rev 2997)
@@ -858,9 +858,14 @@
struct sdo_id
{
sdo_id(const char* id) : m_id(id) {};
+#ifdef ORB_IS_ORBEXPRESS
+ bool operator()(const SDO_var sdo)
+#else
bool operator()(const SDO_ptr sdo)
+#endif
{
CORBA::String_var id(sdo->get_sdo_id());
+
return m_id == (const char*)id;
}
std::string m_id;
More information about the openrtm-commit
mailing list