summaryrefslogtreecommitdiff
path: root/ace/OS_String.h
diff options
context:
space:
mode:
authorbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-10-22 23:37:54 +0000
committerbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-10-22 23:37:54 +0000
commit4d6f061f369fb824ceb0376fdb1b001669cc0cae (patch)
treec00db5a162cfbc0adc3c1426e06cda743403e1d1 /ace/OS_String.h
parent35a20a043bbca9853fe7976434dc0fba3052bdaa (diff)
downloadATCD-4d6f061f369fb824ceb0376fdb1b001669cc0cae.tar.gz
ChangeLogTag:Sun Oct 22 16:32:24 2000 Darrell Brunsch <brunsch@uci.edu>
Diffstat (limited to 'ace/OS_String.h')
-rw-r--r--ace/OS_String.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/ace/OS_String.h b/ace/OS_String.h
index 9bc1b0a789a..a3746d42840 100644
--- a/ace/OS_String.h
+++ b/ace/OS_String.h
@@ -216,10 +216,10 @@ public:
/// Finds the next token in a string (char version).
static char *strtok (char *s, const char *tokens);
-#if defined (ACE_HAS_WCHAR)
+#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOK)
/// Finds the next token in a string (wchar_t version).
static wchar_t *strtok (wchar_t *s, const wchar_t *tokens);
-#endif /* ACE_HAS_WCHAR */
+#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOK */
//@}
@@ -474,7 +474,7 @@ private:
#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSNCMP)
/// Emulated wcsncmp - Compares two arrays.
- static int wcsncmp_emulation (const wchar_t string1,
+ static int wcsncmp_emulation (const wchar_t *string1,
const wchar_t *string2,
size_t len);
#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSNCMP */
@@ -510,6 +510,12 @@ private:
static const wchar_t *wcsrchr_emulation (const wchar_t *string, wint_t c);
#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSRCHR */
+#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCSPN)
+ /// Emulated wcsspn.
+ static size_t wcscspn_emulation (const wchar_t *string,
+ const wchar_t *reject);
+#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCSPN */
+
#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSSPN)
/// Emulated wcsspn.
static size_t wcsspn_emulation (const wchar_t *string,