summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-04-11 08:29:23 +0000
committerdhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-04-11 08:29:23 +0000
commitcbe7a541701d7674dd091cacc3c5279f8c65b716 (patch)
tree7ba69d9495e69285343ce6b21efaecd7ab3821cd
parentcf7fd477ef99d78b83c8f2f11ea166d6402811e5 (diff)
downloadATCD-cbe7a541701d7674dd091cacc3c5279f8c65b716.tar.gz
ChangeLogTag:Thu Apr 11 08:30:11 UTC 2002 Don Hinton <dhinton@ieee.org>
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLogs/ChangeLog-02a5
-rw-r--r--ChangeLogs/ChangeLog-03a5
-rw-r--r--ace/OS_String.inl2
4 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ebb6fece1d..107ea149534 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 11 08:30:11 UTC 2002 Don Hinton <dhinton@ieee.org>
+
+ * ace/OS_String.inl (strnlen):
+ Fixed compile error.
+
Thu Apr 11 08:16:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Timer_Queue_T.cpp:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 2ebb6fece1d..107ea149534 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,8 @@
+Thu Apr 11 08:30:11 UTC 2002 Don Hinton <dhinton@ieee.org>
+
+ * ace/OS_String.inl (strnlen):
+ Fixed compile error.
+
Thu Apr 11 08:16:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Timer_Queue_T.cpp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 2ebb6fece1d..107ea149534 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,8 @@
+Thu Apr 11 08:30:11 UTC 2002 Don Hinton <dhinton@ieee.org>
+
+ * ace/OS_String.inl (strnlen):
+ Fixed compile error.
+
Thu Apr 11 08:16:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Timer_Queue_T.cpp:
diff --git a/ace/OS_String.inl b/ace/OS_String.inl
index e67dba97448..6637ddeb7f5 100644
--- a/ace/OS_String.inl
+++ b/ace/OS_String.inl
@@ -279,7 +279,7 @@ ACE_OS_String::strnlen (const char *s, size_t maxlen)
ACE_INLINE size_t
ACE_OS_String::strnlen (const ACE_WCHAR_T *s, size_t maxlen)
{
-#if defined (ACE_HAS_WCSNLEN)
+#if defined (ACE_HAS_WCHAR) && defined (ACE_HAS_WCSNLEN)
return wcsnlen (s, maxlen);
#else /* ACE_HAS_WCSNLEN */
size_t i;