diff options
Diffstat (limited to 'TAO/tao/Typecode_Constants.cpp')
| -rw-r--r-- | TAO/tao/Typecode_Constants.cpp | 47 |
1 files changed, 6 insertions, 41 deletions
diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp index 83350f7d670..d884f942381 100644 --- a/TAO/tao/Typecode_Constants.cpp +++ b/TAO/tao/Typecode_Constants.cpp @@ -39,11 +39,9 @@ #include "tao/WrongTransactionC.h" #include "tao/Services.h" #include "tao/NVList.h" -#include "tao/BoundsC.h" - -#if defined(TAO_HAS_AMI_POLLER) +#if defined(TAO_POLLER) #include "tao/PollableC.h" -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_POLLER */ ACE_RCSID(tao, Typecode_Constants, "$Id$") @@ -159,7 +157,6 @@ TAO_NAMESPACE_BEGIN (CORBA) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_exception_type, 0) TAO_NAMESPACE_END - // Some more typecodes in the CORBA namespace. We keep adding // to this list as we find more and more things being introduced // to the CORBA namespace. @@ -180,11 +177,6 @@ TAO_NAMESPACE_BEGIN (CORBA) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ORBid, 0) TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Bounds, 0) -TAO_NAMESPACE_END - CORBA::TypeCode_ptr CORBA_ORB::_tc_ObjectId = 0; CORBA::TypeCode_ptr CORBA_ORB::_tc_InvalidName = 0; @@ -1615,7 +1607,7 @@ TAO_TypeCodes::init (void) // **************************************************************** -#if defined(TAO_HAS_AMI_POLLER) +#if defined(TAO_POLLER) static const CORBA::Long _oc_CORBA_Pollable[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -1693,7 +1685,7 @@ TAO_TypeCodes::init (void) 0, sizeof (CORBA_PollableSet)); -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_POLLER */ // **************************************************************** @@ -1829,30 +1821,6 @@ TAO_TypeCodes::init (void) (char *) &oc_completion_status, 1, sizeof (CORBA::CompletionStatus)); - - static const CORBA::Long _oc_CORBA_Bounds[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order - 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f426f), - ACE_NTOHL (0x756e6473), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Bounds:1.0 - 7, - ACE_NTOHL (0x426f756e), - ACE_NTOHL (0x64730000), // name = Bounds - 0, // member count - }; - CORBA::_tc_Bounds = - new CORBA::TypeCode (CORBA::tk_except, - sizeof (_oc_CORBA_Bounds), - (char *) &_oc_CORBA_Bounds, - 0, - sizeof (CORBA_Bounds)); } // destroy all the typecodes owned by the ORB @@ -1977,13 +1945,13 @@ TAO_TypeCodes::fini (void) CORBA::release (CORBA::_tc_DomainManagerList); -#if defined (TAO_HAS_AMI_POLLER) +#if defined (TAO_POLLER) CORBA::release (CORBA::_tc_Pollable); CORBA::release (CORBA::_tc_DIIPollable); CORBA::release (CORBA::_tc_PollableSet); -#endif /* defined (TAO_HAS_AMI_POLLER) */ +#endif /* defined (TAO_POLLER) */ // Service types //= Service type @@ -1993,12 +1961,9 @@ TAO_TypeCodes::fini (void) CORBA::release (CORBA::_tc_ServiceDetail); CORBA::release (CORBA::_tc_ServiceInformation); - CORBA::release (CORBA::_tc_Bounds); - // TAO specific CORBA::release (TC_opaque); - #if 0 CORBA::release (TC_ServiceContextList); #endif /* 0 */ |