diff options
Diffstat (limited to 'TAO/tao/RTCORBAC.cpp')
| -rw-r--r-- | TAO/tao/RTCORBAC.cpp | 180 |
1 files changed, 5 insertions, 175 deletions
diff --git a/TAO/tao/RTCORBAC.cpp b/TAO/tao/RTCORBAC.cpp index 07ab2d369aa..0a74e80c1f4 100644 --- a/TAO/tao/RTCORBAC.cpp +++ b/TAO/tao/RTCORBAC.cpp @@ -776,6 +776,9 @@ void *RTCORBA::ProtocolProperties::_tao_QueryInterface (ptr_arith_t type) ////////////////////////////////////////////////////// // CDR Encoding Support +// @@ Angelo, can you explain to me why these methods here return +// true, while same methods in PolicyC.cpp return false? + CORBA::Boolean RTCORBA::ProtocolProperties::_tao_encode (TAO_OutputCDR &) { @@ -936,165 +939,6 @@ const char* RTCORBA::GIOPProtocolProperties::_interface_repository_id (void) con return "IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0"; } -// default constructor -RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties (void) -{} - -// destructor -RTCORBA::UnixDomainProtocolProperties::~UnixDomainProtocolProperties (void) -{} - -RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties::_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return UnixDomainProtocolProperties::_unchecked_narrow (obj, ACE_TRY_ENV); -} - -RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment & - ) -{ - if (CORBA::is_nil (obj)) - return UnixDomainProtocolProperties::_nil (); - return - ACE_reinterpret_cast - ( - UnixDomainProtocolProperties_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &UnixDomainProtocolProperties::_narrow - ) - ) - ); -} - -RTCORBA::UnixDomainProtocolProperties_ptr -RTCORBA::UnixDomainProtocolProperties::_duplicate (UnixDomainProtocolProperties_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} - -void *RTCORBA::UnixDomainProtocolProperties::_tao_QueryInterface (ptr_arith_t type) -{ - void *retv = 0; - if (type == ACE_reinterpret_cast - (ptr_arith_t, - &RTCORBA::UnixDomainProtocolProperties::_narrow)) - retv = ACE_reinterpret_cast (void*, this); - else if (type == ACE_reinterpret_cast - (ptr_arith_t, - &RTCORBA::ProtocolProperties::_narrow)) - retv = ACE_reinterpret_cast - ( - void *, - ACE_static_cast - ( - RTCORBA::ProtocolProperties_ptr, - this - ) - ); - else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) - retv = ACE_reinterpret_cast (void *, - ACE_static_cast (CORBA::Object_ptr, this)); - - if (retv) - this->_add_ref (); - return retv; -} - -const char* RTCORBA::UnixDomainProtocolProperties::_interface_repository_id (void) const -{ - return "IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0"; -} - - -// default constructor -RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties (void) -{} - -// destructor -RTCORBA::SharedMemoryProtocolProperties::~SharedMemoryProtocolProperties (void) -{} - -RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolProperties::_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return SharedMemoryProtocolProperties::_unchecked_narrow (obj, ACE_TRY_ENV); -} - -RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment & - ) -{ - if (CORBA::is_nil (obj)) - return SharedMemoryProtocolProperties::_nil (); - return - ACE_reinterpret_cast - ( - SharedMemoryProtocolProperties_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &SharedMemoryProtocolProperties::_narrow - ) - ) - ); -} - -RTCORBA::SharedMemoryProtocolProperties_ptr -RTCORBA::SharedMemoryProtocolProperties::_duplicate (SharedMemoryProtocolProperties_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} - -void *RTCORBA::SharedMemoryProtocolProperties::_tao_QueryInterface (ptr_arith_t type) -{ - void *retv = 0; - if (type == ACE_reinterpret_cast - (ptr_arith_t, - &RTCORBA::SharedMemoryProtocolProperties::_narrow)) - retv = ACE_reinterpret_cast (void*, this); - else if (type == ACE_reinterpret_cast - (ptr_arith_t, - &RTCORBA::ProtocolProperties::_narrow)) - retv = ACE_reinterpret_cast - ( - void *, - ACE_static_cast - ( - RTCORBA::ProtocolProperties_ptr, - this - ) - ); - else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) - retv = ACE_reinterpret_cast (void *, - ACE_static_cast (CORBA::Object_ptr, this)); - - if (retv) - this->_add_ref (); - return retv; -} - -const char* RTCORBA::SharedMemoryProtocolProperties::_interface_repository_id (void) const -{ - return "IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0"; -} - #if !defined (TAO_USE_SEQUENCE_TEMPLATES) @@ -1521,9 +1365,9 @@ RTCORBA::RTORB::InvalidThreadpool::~InvalidThreadpool (void) // copy constructor RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (const ::RTCORBA::RTORB::InvalidThreadpool &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException (_tao_excp._type ()) { -} + } // assignment operator RTCORBA::RTORB::InvalidThreadpool& @@ -2024,20 +1868,6 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::PriorityB #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<RTCORBA::UnixDomainProtocolProperties,RTCORBA::UnixDomainProtocolProperties_var>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - # pragma instantiate TAO_Object_Manager<RTCORBA::UnixDomainProtocolProperties,RTCORBA::UnixDomainProtocolProperties_var> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<RTCORBA::SharedMemoryProtocolProperties,RTCORBA::SharedMemoryProtocolProperties_var>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - # pragma instantiate TAO_Object_Manager<RTCORBA::SharedMemoryProtocolProperties,RTCORBA::SharedMemoryProtocolProperties_var> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) template class TAO_Object_Manager<RTCORBA::ServerProtocolPolicy,RTCORBA::ServerProtocolPolicy_var>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO_Object_Manager<RTCORBA::ServerProtocolPolicy,RTCORBA::ServerProtocolPolicy_var> |