diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-07 08:03:55 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-07 08:03:55 +0000 |
| commit | 28d501fc933f7538e7d7387036fd8a74cc274db4 (patch) | |
| tree | bbf322a3bd9db404423f5ae4f5dc695a4a53fa23 /ace/ace_wchar.h | |
| parent | 12412a39bc9c7bf69ca773bf1ab9e271d7ab1705 (diff) | |
| download | ATCD-28d501fc933f7538e7d7387036fd8a74cc274db4.tar.gz | |
ChangeLogTag:Sat Oct 7 000:50:02 2000 Darrell Brunsch <brunsch@uci.edu>
Diffstat (limited to 'ace/ace_wchar.h')
| -rw-r--r-- | ace/ace_wchar.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ace/ace_wchar.h b/ace/ace_wchar.h index cbb5798be59..61e32ae46c1 100644 --- a/ace/ace_wchar.h +++ b/ace/ace_wchar.h @@ -41,7 +41,6 @@ # define ASYS_MULTIBYTE_STRING ACE_TEXT_CHAR_TO_TCHAR # define ASYS_WIDE_STRING ACE_TEXT_CHAR_TO_TCHAR # define ACE_WIDE_STRING ACE_TEXT_CHAR_TO_TCHAR -# define ACE_DIRECTORY_SEPARATOR_CHAR_A ACE_DIRECTORY_SEPARATOR_CHAR # if defined (ACE_USES_WCHAR) # define ASYS_ONLY_WIDE_STRING(STRING) STRING @@ -100,23 +99,30 @@ using std::size_t; // Define the unicode/wchar related macros correctly # if !defined (ACE_TEXT_WIDE) -# define ACE_TEXT_WIDE(STRING) L##STRING +# define ACE_TEXT_WIDE_I(STRING) L##STRING +# define ACE_TEXT_WIDE(STRING) ACE_TEXT_WIDE_I (STRING) # endif /* ACE_TEXT_WIDE */ #if defined (ACE_USES_WCHAR) typedef wchar_t ACE_TCHAR; -# define ACE_TEXT(STRING) ACE_TEXT_WIDE (STRING) +# define ACE_LIB_TEXT(STRING) ACE_TEXT_WIDE (STRING) # define ACE_TEXT_ALWAYS_CHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep () # define ACE_TEXT_CHAR_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () # define ACE_TEXT_WCHAR_TO_TCHAR(STRING) STRING #else /* ACE_USES_WCHAR */ typedef char ACE_TCHAR; -# define ACE_TEXT(STRING) STRING +# define ACE_LIB_TEXT(STRING) STRING # define ACE_TEXT_ALWAYS_CHAR(STRING) STRING # define ACE_TEXT_CHAR_TO_TCHAR(STRING) STRING # define ACE_TEXT_WCHAR_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 */ + #if defined ACE_HAS_WCHAR class ACE_Wide_To_Ascii { |