diff options
Diffstat (limited to 'ace/Global_Macros.h')
| -rw-r--r-- | ace/Global_Macros.h | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/ace/Global_Macros.h b/ace/Global_Macros.h index c181ed86b78..0bdc038c1df 100644 --- a/ace/Global_Macros.h +++ b/ace/Global_Macros.h @@ -70,7 +70,7 @@ private: # define ACE_ITOA(X) #X // Create a string of a server address with a "host:port" format. -# define ACE_SERVER_ADDRESS(H,P) H":"P +# define ACE_SERVER_ADDRESS(H,P) H ACE_TEXT(":") P // A couple useful inline functions for checking whether bits are // enabled or disabled. @@ -96,13 +96,15 @@ private: # define ACE_UNIMPLEMENTED_FUNC(f) f; # endif /* ACE_NEEDS_FUNC_DEFINITIONS */ -// Easy way to designate that a class is used as a pseudo-namespace. -// Insures that g++ "friendship" anamolies are properly handled. -# define ACE_CLASS_IS_NAMESPACE(CLASSNAME) \ -private: \ -CLASSNAME (void); \ -CLASSNAME (const CLASSNAME&); \ -friend class ace_dewarn_gplusplus +#if !defined (ACE_LACKS_DEPRECATED_MACROS) + // Easy way to designate that a class is used as a pseudo-namespace. + // Insures that g++ "friendship" anamolies are properly handled. + # define ACE_CLASS_IS_NAMESPACE(CLASSNAME) \ + private: \ + CLASSNAME (void); \ + CLASSNAME (const CLASSNAME&); \ + friend class ace_dewarn_gplusplus +#endif /* ACE_LACKS_DEPRECATED_MACROS */ // ---------------------------------------------------------------- @@ -132,21 +134,23 @@ friend class ace_dewarn_gplusplus # endif /* ! ACE_HAS_BROKEN_NAMESPACES */ # endif /* !ACE_NESTED_CLASS */ -/** - * @name CORBA namespace macros. - * - * CORBA namespace macros. - * - * @deprecated These macros were formerly used by TAO but are now - * deprecated, and only remain to retain some backward - * compatibility. They will be removed in a future ACE - * release. - */ -//@{ -# define ACE_CORBA_1(NAME) CORBA::NAME -# define ACE_CORBA_2(TYPE, NAME) CORBA::TYPE::NAME -# define ACE_CORBA_3(TYPE, NAME) CORBA::TYPE::NAME -//@} +#if !defined (ACE_LACKS_DEPRECATED_MACROS) + /** + * @name CORBA namespace macros. + * + * CORBA namespace macros. + * + * @deprecated These macros were formerly used by TAO but are now + * deprecated, and only remain to retain some backward + * compatibility. They will be removed in a future ACE + * release. + */ + //@{ + # define ACE_CORBA_1(NAME) CORBA::NAME + # define ACE_CORBA_2(TYPE, NAME) CORBA::TYPE::NAME + # define ACE_CORBA_3(TYPE, NAME) CORBA::TYPE::NAME + //@} +#endif /* ACE_LACKS_DEPRECATED_MACROS */ // ---------------------------------------------------------------- |