diff options
Diffstat (limited to 'ace/OS_String.inl')
| -rw-r--r-- | ace/OS_String.inl | 150 |
1 files changed, 26 insertions, 124 deletions
diff --git a/ace/OS_String.inl b/ace/OS_String.inl index 68ddd37c119..58257902b86 100644 --- a/ace/OS_String.inl +++ b/ace/OS_String.inl @@ -9,12 +9,6 @@ */ //============================================================================= -#if defined (ACE_HAS_PACE) -# include /**/ "pace/string.h" -# include /**/ "pace/ctype.h" -# include /**/ "pace/stdlib.h" -#endif /* ACE_HAS_PACE */ - // Matthew Stevens 7-10-95 Fix GNU GCC 2.7 for memchr() problem. #if defined (ACE_HAS_GNU_CSTRING_H) // Define this file to keep /usr/include/memory.h from being included. @@ -41,9 +35,7 @@ ACE_INLINE const void * ACE_OS_String::memchr (const void *s, int c, size_t len) { -#if defined (ACE_HAS_PACE) - return pace_memchr (s, c, len); -#elif defined (ACE_HAS_MEMCHR) +#if defined (ACE_HAS_MEMCHR) return ::memchr (s, c, len); #else /* ACE_HAS_MEMCHR */ return ACE_OS_String::memchr_emulation (s, c, len); @@ -61,52 +53,32 @@ ACE_OS_String::memchr (void *s, int c, size_t len) ACE_INLINE int ACE_OS_String::memcmp (const void *t, const void *s, size_t len) { -#if defined (ACE_HAS_PACE) - return pace_memcmp (t, s, len); -#else return ::memcmp (t, s, len); -#endif /* ACE_HAS_PACE */ } ACE_INLINE void * ACE_OS_String::memcpy (void *t, const void *s, size_t len) { -#if defined (ACE_HAS_PACE) - return pace_memcpy (t, s, len); -#else return ::memcpy (t, s, len); -#endif /* ACE_HAS_PACE */ } ACE_INLINE void * ACE_OS_String::memmove (void *t, const void *s, size_t len) { -#if defined (ACE_HAS_PACE) - return pace_memmove (t, s, len); -#else return ::memmove (t, s, len); -#endif /* ACE_HAS_PACE */ } ACE_INLINE void * ACE_OS_String::memset (void *s, int c, size_t len) { -#if defined (ACE_HAS_PACE) - return pace_memset (s, c, len); -#else return ::memset (s, c, len); -#endif /* ACE_HAS_PACE */ } ACE_INLINE char * ACE_OS_String::strcat (char *s, const char *t) { -#if defined (ACE_HAS_PACE) - return pace_strcat (s, t); -#else return ::strcat (s, t); -#endif /* ACE_HAS_PACE */ } #if defined (ACE_HAS_WCHAR) @@ -124,13 +96,11 @@ ACE_OS_String::strcat (wchar_t *s, const wchar_t *t) ACE_INLINE const char * ACE_OS_String::strchr (const char *s, int c) { -#if defined (ACE_HAS_PACE) - return pace_strchr (s, c); -#elif defined (ACE_LACKS_STRCHR) +#if defined (ACE_LACKS_STRCHR) return ACE_OS_String::strchr_emulation (s, c); #else /* ! ACE_LACKS_STRCHR */ return (const char *) ::strchr (s, c); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_STRCHR */ } #if defined (ACE_HAS_WCHAR) @@ -148,13 +118,11 @@ ACE_OS_String::strchr (const wchar_t *s, wint_t c) ACE_INLINE char * ACE_OS_String::strchr (char *s, int c) { -#if defined (ACE_HAS_PACE) - return pace_strchr (s, c); -#elif defined (ACE_LACKS_STRCHR) +#if defined (ACE_LACKS_STRCHR) return ACE_OS_String::strchr_emulation (s, c); #else /* ! ACE_LACKS_STRCHR */ return ::strchr (s, c); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_STRCHR */ } #if defined (ACE_HAS_WCHAR) @@ -169,11 +137,7 @@ ACE_OS_String::strchr (wchar_t *s, wint_t c) ACE_INLINE int ACE_OS_String::strcmp (const char *s, const char *t) { -#if defined (ACE_HAS_PACE) - return pace_strcmp (s, t); -#else return ::strcmp (s, t); -#endif /* ACE_HAS_PACE */ } ACE_INLINE int @@ -189,11 +153,7 @@ ACE_OS_String::strcmp (const ACE_WCHAR_T *s, const ACE_WCHAR_T *t) ACE_INLINE char * ACE_OS_String::strcpy (char *s, const char *t) { -#if defined (ACE_HAS_PACE) - return pace_strcpy (s, t); -#else /* ACE_HAS_PACE */ return ::strcpy (s, t); -#endif /* ACE_HAS_PACE */ } #if defined (ACE_HAS_WCHAR) @@ -211,9 +171,7 @@ ACE_OS_String::strcpy (wchar_t *s, const wchar_t *t) ACE_INLINE size_t ACE_OS_String::strcspn (const char *s, const char *reject) { -#if defined (ACE_HAS_PACE) - return pace_strcspn (s, reject); -#elif defined (ACE_LACKS_STRCSPN) +#if defined (ACE_LACKS_STRCSPN) return ACE_OS_String::strcspn_emulation (s, reject); #else /* ACE_LACKS_STRCSPN */ return ::strcspn (s, reject); @@ -245,11 +203,7 @@ ACE_OS_String::strerror (int errnum) ACE_INLINE size_t ACE_OS_String::strlen (const char *s) { -#if defined (ACE_HAS_PACE) - return pace_strlen (s); -#else /* ACE_HAS_PACE */ return ::strlen (s); -#endif /* ACE_HAS_PACE */ } ACE_INLINE size_t @@ -293,11 +247,7 @@ ACE_OS_String::strnlen (const ACE_WCHAR_T *s, size_t maxlen) ACE_INLINE char * ACE_OS_String::strncat (char *s, const char *t, size_t len) { -#if defined (ACE_HAS_PACE) - return pace_strncat (s, t, len); -#else /* ACE_HAS_PACE */ return ::strncat (s, t, len); -#endif /* ACE_HAS_PACE */ } ACE_INLINE ACE_WCHAR_T * @@ -313,11 +263,7 @@ ACE_OS_String::strncat (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len) ACE_INLINE int ACE_OS_String::strncmp (const char *s, const char *t, size_t len) { -#if defined (ACE_HAS_PACE) - return pace_strncmp (s, t, len); -#else /* ACE_HAS_PACE */ return ::strncmp (s, t, len); -#endif /* ACE_HAS_PACE */ } ACE_INLINE int @@ -333,11 +279,7 @@ ACE_OS_String::strncmp (const ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len) ACE_INLINE char * ACE_OS_String::strncpy (char *s, const char *t, size_t len) { -#if defined (ACE_HAS_PACE) - return pace_strncpy (s, t, len); -#else /* ACE_HAS_PACE */ return ::strncpy (s, t, len); -#endif /* ACE_HAS_PACE */ } ACE_INLINE ACE_WCHAR_T * @@ -353,13 +295,11 @@ ACE_OS_String::strncpy (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len) ACE_INLINE const char * ACE_OS_String::strpbrk (const char *s1, const char *s2) { -#if defined (ACE_HAS_PACE) - return (const char*) pace_strpbrk (s1, s2); -#elif defined (ACE_LACKS_STRPBRK) +#if defined (ACE_LACKS_STRPBRK) return ACE_OS_String::strpbrk_emulation (s1, s2); -#else /* ACE_HAS_PACE */ +#else /* ACE_LACKS_STRPBRK */ return (const char *) ::strpbrk (s1, s2); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_STRPBRK */ } #if defined (ACE_HAS_WCHAR) @@ -377,13 +317,11 @@ ACE_OS_String::strpbrk (const wchar_t *s, const wchar_t *t) ACE_INLINE char * ACE_OS_String::strpbrk (char *s1, const char *s2) { -#if defined (ACE_HAS_PACE) - return pace_strpbrk (s1, s2); -#elif defined (ACE_LACKS_STRPBRK) +#if defined (ACE_LACKS_STRPBRK) return ACE_OS_String::strpbrk_emulation (s1, s2); -#else /* ACE_HAS_PACE */ +#else /* ACE_LACKS_STRPBRK */ return ::strpbrk (s1, s2); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_STRPBRK */ } #if defined (ACE_HAS_WCHAR) @@ -398,9 +336,7 @@ ACE_OS_String::strpbrk (wchar_t *s, const wchar_t *t) ACE_INLINE const char * ACE_OS_String::strrchr (const char *s, int c) { -#if defined (ACE_HAS_PACE) - return (const char*) pace_strrchr (s, c); -#elif defined (ACE_LACKS_STRRCHR) +#if defined (ACE_LACKS_STRRCHR) return ACE_OS_String::strrchr_emulation (s, c); #else /* ! ACE_LACKS_STRRCHR */ return (const char *) ::strrchr (s, c); @@ -422,9 +358,7 @@ ACE_OS_String::strrchr (const wchar_t *s, wint_t c) ACE_INLINE char * ACE_OS_String::strrchr (char *s, int c) { -#if defined (ACE_HAS_PACE) - return pace_strrchr (s, c); -#elif defined (ACE_LACKS_STRRCHR) +#if defined (ACE_LACKS_STRRCHR) return ACE_OS_String::strrchr_emulation (s, c); #else /* ! ACE_LACKS_STRRCHR */ return ::strrchr (s, c); @@ -443,13 +377,11 @@ ACE_OS_String::strrchr (wchar_t *s, wint_t c) ACE_INLINE size_t ACE_OS_String::strspn (const char *s, const char *t) { -#if defined (ACE_HAS_PACE) - return pace_strspn (s, t); -#elif defined (ACE_LACKS_STRSPN) +#if defined (ACE_LACKS_STRSPN) return ACE_OS_String::strspn_emulation (s, t); -#else /* ACE_HAS_PACE */ +#else /* ACE_LACKS_STRSPN */ return ::strspn (s, t); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_STRSPN */ } #if defined (ACE_HAS_WCHAR) @@ -467,11 +399,7 @@ ACE_OS_String::strspn (const wchar_t *s, const wchar_t *t) ACE_INLINE const char * ACE_OS_String::strstr (const char *s, const char *t) { -#if defined (ACE_HAS_PACE) - return pace_strstr (s, t); -#else /* ACE_HAS_PACE */ return (const char *) ::strstr (s, t); -#endif /* ACE_HAS_PACE */ } #if defined (ACE_HAS_WCHAR) @@ -491,11 +419,7 @@ ACE_OS_String::strstr (const wchar_t *s, const wchar_t *t) ACE_INLINE char * ACE_OS_String::strstr (char *s, const char *t) { -#if defined (ACE_HAS_PACE) - return pace_strstr (s, t); -#else /* ACE_HAS_PACE */ return ::strstr (s, t); -#endif /* ACE_HAS_PACE */ } #if defined (ACE_HAS_WCHAR) @@ -515,11 +439,7 @@ ACE_OS_String::strstr (wchar_t *s, const wchar_t *t) ACE_INLINE char * ACE_OS_String::strtok (char *s, const char *tokens) { -#if defined (ACE_HAS_PACE) - return pace_strtok (s, tokens); -#else /* ACE_HAS_PACE */ return ::strtok (s, tokens); -#endif /* ACE_HAS_PACE */ } #if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOK) @@ -540,8 +460,6 @@ ACE_OS_String::ace_isprint (const ACE_TCHAR c) { #if defined (ACE_USES_WCHAR) return iswprint (c); -#elif defined (ACE_HAS_PACE) - return pace_isprint (c); #else /* ACE_USES_WCHAR */ return isprint (c); #endif /* ACE_USES_WCHAR */ @@ -552,21 +470,15 @@ ACE_OS_String::ace_isspace (const ACE_TCHAR c) { #if defined (ACE_USES_WCHAR) return iswspace (c); -#elif defined (ACE_HAS_PACE) - return pace_isspace (c); -#else /* ACE_HAS_PACE */ +#else /* ACE_USES_WCHAR */ return isspace (c); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_USES_WCHAR */ } ACE_INLINE int ACE_OS_String::to_lower (int c) { -#if defined (ACE_HAS_PACE) - return pace_tolower (c); -#else /* ACE_HAS_PACE */ return tolower (c); -#endif /* ACE_HAS_PACE */ } #if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_TOWLOWER) @@ -690,9 +602,7 @@ ACE_OS_String::strnstr (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len) ACE_INLINE char * ACE_OS_String::strtok_r (char *s, const char *tokens, char **lasts) { -#if defined (ACE_HAS_PACE) - return pace_strtok_r (s, tokens, lasts); -#elif defined (ACE_HAS_REENTRANT_FUNCTIONS) +#if defined (ACE_HAS_REENTRANT_FUNCTIONS) return ::strtok_r (s, tokens, lasts); #else return ACE_OS_String::strtok_r_emulation (s, tokens, lasts); @@ -720,11 +630,7 @@ ACE_OS_String::strtok_r (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T ACE_INLINE double ACE_OS_String::strtod (const char *s, char **endptr) { -#if defined (ACE_HAS_PACE) - return pace_strtod (s, endptr); -#else /* ACE_HAS_PACE */ return ::strtod (s, endptr); -#endif /* ACE_HAS_PACE */ } #endif /* !ACE_LACKS_STRTOD */ @@ -739,13 +645,11 @@ ACE_OS_String::strtod (const wchar_t *s, wchar_t **endptr) ACE_INLINE long ACE_OS_String::strtol (const char *s, char **ptr, int base) { -#if defined (ACE_HAS_PACE) - return pace_strtol (s, ptr, base); -#elif defined (ACE_LACKS_STRTOL) +#if defined (ACE_LACKS_STRTOL) return ACE_OS_String::strtol_emulation (s, ptr, base); -#else /* ACE_HAS_PACE */ +#else /* ACE_LACKS_STRTOL */ return ::strtol (s, ptr, base); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_STRTOL */ } #if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOL) @@ -759,13 +663,11 @@ ACE_OS_String::strtol (const wchar_t *s, wchar_t **ptr, int base) ACE_INLINE unsigned long ACE_OS_String::strtoul (const char *s, char **ptr, int base) { -#if defined (ACE_HAS_PACE) - return pace_strtoul (s, ptr, base); -#elif defined (ACE_LACKS_STRTOUL) +#if defined (ACE_LACKS_STRTOUL) return ACE_OS_String::strtoul_emulation (s, ptr, base); -#else /* ACE_HAS_PACE */ +#else /* ACE_LACKS_STRTOUL */ return ::strtoul (s, ptr, base); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_STRTOUL */ } #if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOUL) |