From f242488932c81331759f9a1d242967cf08fb3dc1 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 28 Feb 2005 14:42:40 +0000 Subject: ChangeLogTag: Mon Feb 28 14:42:12 UTC 2005 Johnny Willemsen --- TAO/tao/ORB_Constants.h | 50 ++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/TAO/tao/ORB_Constants.h b/TAO/tao/ORB_Constants.h index 1efe5541709..6e324f0f908 100644 --- a/TAO/tao/ORB_Constants.h +++ b/TAO/tao/ORB_Constants.h @@ -113,30 +113,34 @@ namespace TAO */ //@{ /// TAO VMCID assigned by the OMG. -/** - * @note This constant has historically been used in the wrong way. - * It was often used as the @a location argument to the @c - * CORBA::SystemException::_tao_minor_code() static method. A - * more appropriate default @a location argument/value would - * have been zero since the location code resides in portion of - * the lower order 12 bits, not the higher order 20 bits which - * is where the VMCID resides, and what this value happens to - * be. - * - * @deprecated Please use @c TAO::VMCID instead, or zero if being used - * as default TAO exception location code argument. - * - * @see @c TAO::VMCID - */ -const CORBA::ULong TAO_DEFAULT_MINOR_CODE = TAO::VMCID; +#if !defined (ACE_LACKS_DEPRECATED_MACROS) + /** + * @note This constant has historically been used in the wrong way. + * It was often used as the @a location argument to the @c + * CORBA::SystemException::_tao_minor_code() static method. A + * more appropriate default @a location argument/value would + * have been zero since the location code resides in portion of + * the lower order 12 bits, not the higher order 20 bits which + * is where the VMCID resides, and what this value happens to + * be. + * + * @deprecated Please use @c TAO::VMCID instead, or zero if being used + * as default TAO exception location code argument. + * + * @see @c TAO::VMCID + */ + const CORBA::ULong TAO_DEFAULT_MINOR_CODE = TAO::VMCID; +#endif /* !ACE_LACKS_DEPRECATED_MACROS */ -/// Maximum allowed system exception minor code. -/** - * @deprecated Please use @c TAO::MAX_MINOR_CODE instead. - * - * @see @c TAO::MAX_MINOR_CODE - */ -const CORBA::ULong TAO_MAX_MINOR_CODE = TAO::MAX_MINOR_CODE; +#if !defined (ACE_LACKS_DEPRECATED_MACROS) + /// Maximum allowed system exception minor code. + /** + * @deprecated Please use @c TAO::MAX_MINOR_CODE instead. + * + * @see @c TAO::MAX_MINOR_CODE + */ + const CORBA::ULong TAO_MAX_MINOR_CODE = TAO::MAX_MINOR_CODE; +#endif /* !ACE_LACKS_DEPRECATED_MACROS */ //@} /// A dummy service context that is inserted in the service context -- cgit v1.2.1