diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h index 9913cc8c8c9..be09a2870a5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h @@ -11,33 +11,24 @@ #ifndef ACTIVATE_WITH_ID_H #define ACTIVATE_WITH_ID_H -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class T> void activate_object_with_id (T * &result, PortableServer::POA_ptr poa, PortableServer::ServantBase *servant, const FtRtecEventComm::ObjectId &oid - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) { - const PortableServer::ObjectId& id = - reinterpret_cast<const PortableServer::ObjectId&> (oid); + const PortableServer::ObjectId& id = reinterpret_cast<const PortableServer::ObjectId&> (oid); poa->activate_object_with_id(id, - servant - ACE_ENV_ARG_PARAMETER); + servant ACE_ENV_ARG_PARAMETER); + ACE_CHECK; - CORBA::Object_var object = - poa->id_to_reference(id - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var object = poa-> + id_to_reference(id ACE_ENV_ARG_PARAMETER); ACE_CHECK; result = T::_narrow(object.in() ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL - #endif |