diff options
| author | Steve Huston <shuston@riverace.com> | 2004-10-06 20:39:28 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2004-10-06 20:39:28 +0000 |
| commit | 87d2ce45620b384492d804198e46553d118fb9f5 (patch) | |
| tree | 5cc6b740df807da33da9a2fe10de219fe5a2f71a | |
| parent | b3d2be0c2f9c5aca24e3288dc67d0d4b5121d317 (diff) | |
| download | ATCD-87d2ce45620b384492d804198e46553d118fb9f5.tar.gz | |
ChangeLogTag:Wed Oct 6 16:34:29 2004 Steve HUston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ace/OS_NS_wchar.cpp | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 1b5b42df240..61eb70ff0f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Oct 6 16:34:29 2004 Steve Huston <shuston@riverace.com> + + * ace/OS_NS_wchar.cpp: For ACE_HAS_WCHAR, #include "ace/OS_NS_string.h" + since it's needed in some of the emulation methods. + Wed Oct 6 14:50:53 2004 Chris Cleeland <cleeland_c@ociweb.com> * tests/Message_Queue_Test.cpp (iterator_test): Changed initial diff --git a/ace/OS_NS_wchar.cpp b/ace/OS_NS_wchar.cpp index 7150d7f3627..04d7fca9926 100644 --- a/ace/OS_NS_wchar.cpp +++ b/ace/OS_NS_wchar.cpp @@ -11,6 +11,7 @@ ACE_RCSID(ace, OS_NS_wchar, "$Id$") #if defined (ACE_HAS_WCHAR) # include "ace/OS_NS_ctype.h" +# include "ace/OS_NS_string.h" #endif /* ACE_HAS_WCHAR */ // The following wcs*_emulation methods were created based on BSD code: @@ -356,7 +357,7 @@ ACE_OS::wcsstr_emulation (const wchar_t *string, if ((c = *charset++) != 0) { - len = strlen(charset); + len = ACE_OS::strlen (charset); do { do @@ -364,7 +365,7 @@ ACE_OS::wcsstr_emulation (const wchar_t *string, if ((sc = *string++) == 0) return 0; } while (sc != c); - } while (strncmp(string, charset, len) != 0); + } while (ACE_OS::strncmp (string, charset, len) != 0); string--; } |