diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-04-24 01:26:37 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-04-24 01:26:37 +0000 |
| commit | aa080d0666fa7838bed2d5073e8a004b973e7c35 (patch) | |
| tree | 4f4f2bad32410216cda5647a59e75883209d376a /ace/ace_wchar.h | |
| parent | 593ae93d09477a55f677b1e09d7e2bb83394dcd0 (diff) | |
| download | ATCD-aa080d0666fa7838bed2d5073e8a004b973e7c35.tar.gz | |
ChangeLogTag:Sun Apr 23 18:14:33 2000 Darrell Brunsch <brunsch@uci.edu>
Diffstat (limited to 'ace/ace_wchar.h')
| -rw-r--r-- | ace/ace_wchar.h | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/ace/ace_wchar.h b/ace/ace_wchar.h index 2f38402e22a..7bfe65bce2e 100644 --- a/ace/ace_wchar.h +++ b/ace/ace_wchar.h @@ -21,6 +21,35 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +// These macros have been deprecated and should be replaced by their +// ACE_TEXT_* equivalents. +#if !defined (ACE_ONLY_LATEST_AND_GREATEST) +// Convert the old unicode indicators +# if defined (ACE_HAS_MOSTLY_UNICODE_APIS) +# define ACE_USES_WCHAR +# endif /* ACE_HAS_MOSTLY_UNICODE_APIS */ +# if defined (ACE_HAS_UNICODE) +# define ACE_HAS_WCHAR +# endif /* ACE_HAS_UNICODE */ + +// These are defined to get older stuff to compile +# define ASYS_TCHAR ACE_TCHAR +# define ASYS_TEXT ACE_TEXT +# define ASYS_ONLY_MULTIBYTE_STRING ACE_TEXT_ALWAYS_CHAR +# 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 +# else /* ACE_USES_WCHAR */ +# define ASYS_ONLY_WIDE_STRING(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () +# endif /* ACE_USES_WCHAR */ + +#endif /* ACE_ONLY_LATEST_AND_GREATEST */ + + #if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32) # include /**/ <tchar.h> #endif /* ACE_HAS_WCHAR && ACE_WIN32 */ |