diff options
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/ace_wchar.h | 16 |
2 files changed, 14 insertions, 8 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 321c67eb892..1d1bcd478dc 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Wed Aug 1 07:39:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/ace_wchar.h: + Deprecated ACE_LIB_TEXT. Users can still use it, but not anymore + in the code that is in the distribution + Wed Aug 1 07:30:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * apps/drwho/Multicast_Manager.cpp: diff --git a/ACE/ace/ace_wchar.h b/ACE/ace/ace_wchar.h index 7cf307c452e..2f5f2df5e68 100644 --- a/ACE/ace/ace_wchar.h +++ b/ACE/ace/ace_wchar.h @@ -122,7 +122,10 @@ using std::size_t; #if defined (ACE_USES_WCHAR) typedef wchar_t ACE_TCHAR; typedef char ACE_ANTI_TCHAR; -# define ACE_LIB_TEXT(STRING) ACE_TEXT_WIDE (STRING) +# define ACE_TEXT(STRING) ACE_TEXT_WIDE (STRING) +# if !defined (ACE_LACKS_DEPRECATED_MACROS) +# define ACE_LIB_TEXT(STRING) ACE_TEXT_WIDE (STRING) +# endif # define ACE_TEXT_ALWAYS_CHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep () # define ACE_TEXT_ALWAYS_WCHAR(STRING) STRING # define ACE_TEXT_CHAR_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () @@ -131,7 +134,10 @@ typedef char ACE_ANTI_TCHAR; #else /* ACE_USES_WCHAR */ typedef char ACE_TCHAR; typedef wchar_t ACE_ANTI_TCHAR; -# define ACE_LIB_TEXT(STRING) STRING +# define ACE_TEXT(STRING) STRING +# if !defined (ACE_LACKS_DEPRECATED_MACROS) +# define ACE_LIB_TEXT(STRING) STRING +# endif # define ACE_TEXT_ALWAYS_CHAR(STRING) STRING # define ACE_TEXT_ALWAYS_WCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () # define ACE_TEXT_CHAR_TO_TCHAR(STRING) STRING @@ -139,12 +145,6 @@ typedef wchar_t ACE_ANTI_TCHAR; # define ACE_TEXT_ANTI_TO_TCHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep () #endif /* ACE_USES_WCHAR */ -#if defined (ACE_LEGACY_MODE) -# define ACE_TEXT TEXT -#else /* ACE_LEGACY_MODE */ -# define ACE_TEXT ACE_LIB_TEXT -#endif /* ACE_LEGACY_MODE */ - // The OS_String module defines some wide-char functions that are not // universally available. In particular, they're not part of the // XPG4 Worldwide Portability Interface wide-character string handling |