diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-02 19:13:17 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-02 19:13:17 +0000 |
| commit | 8af7efb1a69303c972d8ccc17aabfbe2bc307f36 (patch) | |
| tree | 0cb8cfc46aa620d0e156397507d1894adc1c436c | |
| parent | 4c2559cb0f66d83923eac36850688b775e102fc3 (diff) | |
| download | ATCD-8af7efb1a69303c972d8ccc17aabfbe2bc307f36.tar.gz | |
Moved ACE_TString definition so it can now be a typedef.
| -rw-r--r-- | ace/SString.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ace/SString.h b/ace/SString.h index ab4678b2ac3..533c7709343 100644 --- a/ace/SString.h +++ b/ace/SString.h @@ -19,12 +19,6 @@ #include "ace/ACE.h" -#if defined (UNICODE) -#define ACE_TString ACE_WString -#else /* UNICODE */ -#define ACE_TString ACE_CString -#endif /* UNICODE */ - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ @@ -492,6 +486,15 @@ ACE_Export ACE_INLINE ACE_WString operator + (const ACE_WString &, const ACE_WSt ACE_Export ostream &operator << (ostream &, const ACE_WString &); #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ +// This allows one to use W or C String based on the Unicode +// setting +#if defined (UNICODE) +typedef ACE_WString ACE_TString; +#else /* UNICODE */ +typedef ACE_CString ACE_TString; +#endif /* UNICODE */ + + // ************************************************************ class ACE_Export ACE_Tokenizer |