diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-12 21:56:06 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-12 21:56:06 +0000 |
| commit | 6368f6e967c01e5e00781ba23a6d6d87e527f437 (patch) | |
| tree | c0e95315ab8cc28629ad1bbcf4115e6b79788faf | |
| parent | bf981338b065f3726017ae34bc2f37e18df54f4c (diff) | |
| download | ATCD-6368f6e967c01e5e00781ba23a6d6d87e527f437.tar.gz | |
ChangeLogTag:Fri Jul 12 17:55:08 2002 Carlos O'Ryan <coryan@atdesk.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | ace/String_Base.i | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index cb27a2f749f..2c477727c09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Jul 12 17:55:08 2002 Carlos O'Ryan <coryan@atdesk.com> + + * ace/String_Base.i: + Fixed rfind() to check for pos == npos also, that solved the + regression test failures. + Fri Jul 12 16:03:22 2002 Steve Huston <shuston@riverace.com> * ace/Basic_Types.h: Itanium is little-endian, like x86. Although diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index cb27a2f749f..2c477727c09 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Fri Jul 12 17:55:08 2002 Carlos O'Ryan <coryan@atdesk.com> + + * ace/String_Base.i: + Fixed rfind() to check for pos == npos also, that solved the + regression test failures. + Fri Jul 12 16:03:22 2002 Steve Huston <shuston@riverace.com> * ace/Basic_Types.h: Itanium is little-endian, like x86. Although diff --git a/ace/String_Base.i b/ace/String_Base.i index 8664859354f..fbc8ba4c934 100644 --- a/ace/String_Base.i +++ b/ace/String_Base.i @@ -391,7 +391,7 @@ ACE_String_Base<CHAR>::strstr (const ACE_String_Base<CHAR> &s) const template <class CHAR> ACE_INLINE ssize_t ACE_String_Base<CHAR>::rfind (CHAR c, ssize_t pos) const { - if (pos > ACE_static_cast (ssize_t, this->len_)) + if (pos == npos || pos > ACE_static_cast (ssize_t, this->len_)) { pos = ACE_static_cast (ssize_t, this->len_); } |