diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-12-05 04:26:53 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-12-05 04:26:53 +0000 |
| commit | 87fc8908eb060bbdb7012e37cddfefd63f050303 (patch) | |
| tree | b881ca7c3e80c136ca48a0b4d86068c93c1896b1 /ace/OS_String.h | |
| parent | f9ea826cb7373b25a13710b1cb8173f4ec68bd75 (diff) | |
| download | ATCD-87fc8908eb060bbdb7012e37cddfefd63f050303.tar.gz | |
ChangeLogTag:Tue Dec 4 22:26:28 2001 Nanbor Wang <nanbor@cs.wustl.edu>
Diffstat (limited to 'ace/OS_String.h')
| -rw-r--r-- | ace/OS_String.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/ace/OS_String.h b/ace/OS_String.h index fb3fb4e7849..c999610cc13 100644 --- a/ace/OS_String.h +++ b/ace/OS_String.h @@ -129,10 +129,8 @@ public: /// Appends part of a string to another string (char version). static char *strncat (char *s, const char *t, size_t len); -#if defined (ACE_HAS_WCHAR) /// Appends part of a string to another string (wchar_t version). - static wchar_t *strncat (wchar_t *s, const wchar_t *t, size_t len); -#endif /* ACE_HAS_WCHAR */ + static ACE_WCHAR_T *strncat (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len); /// Compares two arrays (char version). static int strncmp (const char *s, const char *t, size_t len); @@ -520,12 +518,12 @@ private: static size_t wcslen_emulation (const ACE_WCHAR_T *string); #endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSLEN */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSNCAT) +#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCAT) /// Emulated wcscat - Appends a string. - static wchar_t *wcsncat_emulation (wchar_t *destination, - const wchar_t *source, - size_t count); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCAT */ + static ACE_WCHAR_T *wcsncat_emulation (ACE_WCHAR_T *destination, + const ACE_WCHAR_T *source, + size_t count); +#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSCAT */ #if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCMP) /// Emulated wcsncmp - Compares two arrays. |