diff options
| author | spark <spark@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-03-15 03:51:30 +0000 |
|---|---|---|
| committer | spark <spark@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-03-15 03:51:30 +0000 |
| commit | 48a8dc1cb4e212d5671f257d8fce1add8128968a (patch) | |
| tree | 85d2b99e03a7249b8d8c226b9faa5fdf261bec70 | |
| parent | 917dda7d8bf86cb332229b734614961c4fadc523 (diff) | |
| download | ATCD-48a8dc1cb4e212d5671f257d8fce1add8128968a.tar.gz | |
ChangeLogTag: Thu Mar 14 12:50:00 2002 Si Mong Park <spark@ociweb.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 8 | ||||
| -rw-r--r-- | ace/OS_String.cpp | 6 | ||||
| -rw-r--r-- | ace/OS_String.h | 6 |
5 files changed, 30 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 92e055beb27..9f3bb4eab81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Mar 14 12:50:00 2002 Si Mong Park <spark@ociweb.com> + + * ace/OS_String.h: + * ace/OS_String.inl: + * ace/OS_String.cpp: + Fixed a skipping strtok_r_emulation definition when ACE_HAS_WCHAR is + defined. + Thu Mar 14 11:26:41 2002 Nanbor Wang <nanbor@cs.wustl.edu> * performance-tests/Misc/context_switch_time.cpp: Renamed the diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 92e055beb27..9f3bb4eab81 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Thu Mar 14 12:50:00 2002 Si Mong Park <spark@ociweb.com> + + * ace/OS_String.h: + * ace/OS_String.inl: + * ace/OS_String.cpp: + Fixed a skipping strtok_r_emulation definition when ACE_HAS_WCHAR is + defined. + Thu Mar 14 11:26:41 2002 Nanbor Wang <nanbor@cs.wustl.edu> * performance-tests/Misc/context_switch_time.cpp: Renamed the diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 92e055beb27..9f3bb4eab81 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,11 @@ +Thu Mar 14 12:50:00 2002 Si Mong Park <spark@ociweb.com> + + * ace/OS_String.h: + * ace/OS_String.inl: + * ace/OS_String.cpp: + Fixed a skipping strtok_r_emulation definition when ACE_HAS_WCHAR is + defined. + Thu Mar 14 11:26:41 2002 Nanbor Wang <nanbor@cs.wustl.edu> * performance-tests/Misc/context_switch_time.cpp: Renamed the diff --git a/ace/OS_String.cpp b/ace/OS_String.cpp index 934f32d37b9..f2658eb7fe9 100644 --- a/ace/OS_String.cpp +++ b/ace/OS_String.cpp @@ -424,8 +424,9 @@ ACE_OS_String::strtok_r_emulation (char *s, const char *tokens, char **lasts) *lasts += 1; return s ; } +#endif /* !ACE_HAS_REENTRANT_FUNCTIONS */ -# if defined (ACE_HAS_WCHAR) +#if defined (ACE_HAS_WCHAR) wchar_t* ACE_OS_String::strtok_r_emulation (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T **lasts) { @@ -445,8 +446,7 @@ ACE_OS_String::strtok_r_emulation (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, AC *lasts += 1; return s ; } -# endif // ACE_HAS_WCHAR -#endif /* !ACE_HAS_REENTRANT_FUNCTIONS */ +#endif // ACE_HAS_WCHAR #if !defined (ACE_HAS_MEMCHR) const void * diff --git a/ace/OS_String.h b/ace/OS_String.h index 46f19a6e411..fdd8466c91a 100644 --- a/ace/OS_String.h +++ b/ace/OS_String.h @@ -475,12 +475,12 @@ private: #if !defined (ACE_HAS_REENTRANT_FUNCTIONS) /// Emulated strtok_r. static char *strtok_r_emulation (char *s, const char *tokens, char **lasts); +#endif /* !ACE_HAS_REENTRANT_FUNCTIONS */ -# if defined (ACE_HAS_WCHAR) +#if defined (ACE_HAS_WCHAR) /// Emulated strtok_r (wchar_t version). static wchar_t *strtok_r_emulation (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T **lasts); -# endif // ACE_HAS_WCHAR -#endif /* !ACE_HAS_REENTRANT_FUNCTIONS */ +#endif // ACE_HAS_WCHAR #if defined (ACE_LACKS_STRSPN) /// Emulated wcsspn. |