From 8af7efb1a69303c972d8ccc17aabfbe2bc307f36 Mon Sep 17 00:00:00 2001 From: brunsch Date: Sun, 2 May 1999 19:13:17 +0000 Subject: Moved ACE_TString definition so it can now be a typedef. --- ace/SString.h | 15 +++++++++------ 1 file 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 -- cgit v1.2.1