diff options
Diffstat (limited to 'TAO/tao/PortableServer/ServantRetentionPolicyC.cpp')
-rw-r--r-- | TAO/tao/PortableServer/ServantRetentionPolicyC.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp index a1593b6f7a5..72bbd0a469b 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "ServantRetentionPolicyC.h" +#include "tao/PortableServer/ServantRetentionPolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" @@ -38,6 +38,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -62,7 +64,7 @@ TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::release ( PortableServer::ServantRetentionPolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } PortableServer::ServantRetentionPolicy_ptr @@ -111,18 +113,18 @@ PortableServer::ServantRetentionPolicy::_unchecked_narrow ( PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_duplicate (ServantRetentionPolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void PortableServer::ServantRetentionPolicy::_tao_release (ServantRetentionPolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -181,13 +183,15 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ServantRetention { CORBA::ULong _tao_temp = 0; CORBA::Boolean const _tao_success = strm >> _tao_temp; - + if (_tao_success) { _tao_enumerator = static_cast<PortableServer::ServantRetentionPolicyValue> (_tao_temp); } - + return _tao_success; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ |