diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp index 5fb7d08ad06..f833b81b70c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h" +#include "FT_ProxyAdmin_Base.h" #include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/Servant_Base.h" #include "tao/PortableServer/PortableServer.h" @@ -10,11 +10,9 @@ ACE_RCSID (EventChannel, FT_ProxyAdmin_Base, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - FT_ProxyAdmin_Base::FT_ProxyAdmin_Base(PortableServer::ServantBase* servant, PortableServer::POA_var poa) - : servant_(servant), poa_(poa) +: servant_(servant), poa_(poa) { } @@ -22,9 +20,8 @@ FT_ProxyAdmin_Base::~FT_ProxyAdmin_Base() { } -void -FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid - ACE_ENV_ARG_DECL) +void FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid + ACE_ENV_ARG_DECL) { poa_->activate_object_with_id( reinterpret_cast<const PortableServer::ObjectId&> (oid), @@ -35,18 +32,17 @@ FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid } -const FtRtecEventComm::ObjectId& -FT_ProxyAdmin_Base::object_id(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const +const FtRtecEventComm::ObjectId& FT_ProxyAdmin_Base::object_id(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const { return object_id_; } -CORBA::Object_var -FT_ProxyAdmin_Base::reference(ACE_ENV_SINGLE_ARG_DECL) const +CORBA::Object_var FT_ProxyAdmin_Base::reference(ACE_ENV_SINGLE_ARG_DECL) const { - return poa_->servant_to_reference(servant_ - ACE_ENV_ARG_PARAMETER); + return poa_->servant_to_reference(servant_ + ACE_ENV_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL + + |