diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
| -rw-r--r-- | ace/OS_String.cpp | 14 | ||||
| -rw-r--r-- | ace/OS_String.h | 14 | ||||
| -rw-r--r-- | ace/OS_String.inl | 25 |
6 files changed, 45 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog index 58a2e146b9a..253ba234e14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Dec 4 22:26:28 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/OS_String.h: + * ace/OS_String.i: + * ace/OS_String.cpp (strncpy, wcsncat_emulation): One more + string function that needs to be available. (See next entry.) + Tue Dec 04 22:12:04 2001 Nanbor Wang <nanbor@cs.wustl.edu> * ace/OS_String.h: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 58a2e146b9a..253ba234e14 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Tue Dec 4 22:26:28 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/OS_String.h: + * ace/OS_String.i: + * ace/OS_String.cpp (strncpy, wcsncat_emulation): One more + string function that needs to be available. (See next entry.) + Tue Dec 04 22:12:04 2001 Nanbor Wang <nanbor@cs.wustl.edu> * ace/OS_String.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 58a2e146b9a..253ba234e14 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Tue Dec 4 22:26:28 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/OS_String.h: + * ace/OS_String.i: + * ace/OS_String.cpp (strncpy, wcsncat_emulation): One more + string function that needs to be available. (See next entry.) + Tue Dec 04 22:12:04 2001 Nanbor Wang <nanbor@cs.wustl.edu> * ace/OS_String.h: diff --git a/ace/OS_String.cpp b/ace/OS_String.cpp index efaab11f024..9855d75cde1 100644 --- a/ace/OS_String.cpp +++ b/ace/OS_String.cpp @@ -787,16 +787,16 @@ ACE_OS_String::wcspbrk_emulation (const wchar_t *string, } #endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSPBRK */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSNCAT) -wchar_t * -ACE_OS_String::wcsncat_emulation (wchar_t *destination, - const wchar_t *source, +#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCAT) +ACE_WCHAR_T * +ACE_OS_String::wcsncat_emulation (ACE_WCHAR_T *destination, + const ACE_WCHAR_T *source, size_t count) { if (count != 0) { - wchar_t *d = destination; - const wchar_t *s = source; + ACE_WCHAR_T *d = destination; + const ACE_WCHAR_T *s = source; while (*d != 0) d++; @@ -814,7 +814,7 @@ ACE_OS_String::wcsncat_emulation (wchar_t *destination, return destination; } -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCAT */ +#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSCAT */ #if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCHR) wchar_t * 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. diff --git a/ace/OS_String.inl b/ace/OS_String.inl index fd77c417ea8..b240c334a8b 100644 --- a/ace/OS_String.inl +++ b/ace/OS_String.inl @@ -1,6 +1,6 @@ // -*- C++ -*- //============================================================================= -/** +/** * @file OS_String.inl * * $Id$ @@ -53,7 +53,7 @@ ACE_OS_String::memchr (const void *s, int c, size_t len) ACE_INLINE void * ACE_OS_String::memchr (void *s, int c, size_t len) { - return ACE_const_cast (void *, + return ACE_const_cast (void *, ACE_OS_String::memchr (ACE_static_cast (const void *, s), c, len)); } @@ -161,7 +161,7 @@ ACE_OS_String::strchr (char *s, int c) ACE_INLINE wchar_t * ACE_OS_String::strchr (wchar_t *s, wint_t c) { - return ACE_const_cast (wchar_t *, + return ACE_const_cast (wchar_t *, ACE_OS_String::strchr (ACE_static_cast (const wchar_t *, s), c)); } #endif /* ACE_HAS_WCHAR */ @@ -272,17 +272,15 @@ ACE_OS_String::strncat (char *s, const char *t, size_t len) #endif /* ACE_HAS_PACE */ } -#if defined (ACE_HAS_WCHAR) -ACE_INLINE wchar_t * -ACE_OS_String::strncat (wchar_t *s, const wchar_t *t, size_t len) +ACE_INLINE ACE_WCHAR_T * +ACE_OS_String::strncat (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len) { -# if defined (ACE_LACKS_WCSNCAT) +# if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCAT) return ACE_OS_String::wcsncat_emulation (s, t, len); -# else /* ACE_LACKS_WCSNCAT */ +# else /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCAT */ return ::wcsncat (s, t, len); -# endif /* ACE_LACKS_WCSNCAT */ +# endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCAT */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE int ACE_OS_String::strncmp (const char *s, const char *t, size_t len) @@ -364,7 +362,7 @@ ACE_OS_String::strpbrk (char *s1, const char *s2) ACE_INLINE wchar_t * ACE_OS_String::strpbrk (wchar_t *s, const wchar_t *t) { - return ACE_const_cast (wchar_t *, + return ACE_const_cast (wchar_t *, ACE_OS_String::strpbrk (ACE_static_cast (const wchar_t *, s), t)); } #endif /* ACE_HAS_WCHAR */ @@ -409,7 +407,7 @@ ACE_OS_String::strrchr (char *s, int c) ACE_INLINE wchar_t * ACE_OS_String::strrchr (wchar_t *s, wint_t c) { - return ACE_const_cast (wchar_t *, + return ACE_const_cast (wchar_t *, ACE_OS_String::strrchr (ACE_static_cast (const wchar_t *, s), c)); } #endif /* ACE_HAS_WCHAR */ @@ -603,7 +601,7 @@ ACE_OS_String::strnchr (char *s, int c, size_t len) { #if defined ACE_PSOS_DIAB_PPC /* Compiler problem Diab 4.2b */ const char *const_char_s = s; - return ACE_const_cast (char *, + return ACE_const_cast (char *, ACE_OS_String::strnchr (const_char_s, c, len)); #else return ACE_const_cast (char *, @@ -731,4 +729,3 @@ ACE_OS_String::strtoul (const wchar_t *s, wchar_t **ptr, int base) return ::wcstoul (s, ptr, base); } #endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOUL */ - |