diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-07-15 23:57:34 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-07-15 23:57:34 +0000 |
| commit | 7d9fd14c88b814913534f9ebdf7c966883bb5899 (patch) | |
| tree | 18ea513a5f10033eae2261db804bd8fa9ac0bb84 | |
| parent | e5dec8c647da42034d05d199aa8734663f6fd4b5 (diff) | |
| download | ATCD-7d9fd14c88b814913534f9ebdf7c966883bb5899.tar.gz | |
ChangeLogTag:Mon Jul 15 18:56:47 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | ace/String_Base.cpp | 17 |
3 files changed, 17 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index 38e9a596f5a..caa5bd3ea8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jul 15 18:56:47 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/String_Base.cpp (substring): Changed "nil" to "nill" to + avoid conflicts with a Mac OS X macro. Thanks to Ruslan + Zasukhin <sunshine@public.kherson.ua> for reporting this. + Mon Jul 15 15:18:33 2002 Steve Huston <shuston@riverace.com> * ace/Configuration.{h cpp}: Changed ACE_Configuration_Value_IntId diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 38e9a596f5a..caa5bd3ea8e 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Mon Jul 15 18:56:47 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/String_Base.cpp (substring): Changed "nil" to "nill" to + avoid conflicts with a Mac OS X macro. Thanks to Ruslan + Zasukhin <sunshine@public.kherson.ua> for reporting this. + Mon Jul 15 15:18:33 2002 Steve Huston <shuston@riverace.com> * ace/Configuration.{h cpp}: Changed ACE_Configuration_Value_IntId diff --git a/ace/String_Base.cpp b/ace/String_Base.cpp index cffc54b6661..13751d06ac1 100644 --- a/ace/String_Base.cpp +++ b/ace/String_Base.cpp @@ -88,30 +88,23 @@ template <class CHAR> ACE_String_Base<CHAR> ACE_String_Base<CHAR>::substring (size_t offset, ssize_t length) const { - ACE_String_Base<CHAR> nil; + ACE_String_Base<CHAR> nill; size_t count = length; // case 1. empty string if (this->len_ == 0) - { - return nil; - } + return nill; // case 2. start pos past our end if (offset >= this->len_) - { - return nil; - } + return nill; // No length == empty string. else if (length == 0) - { - return nil; - } + return nill; // Get all remaining bytes. else if (length == -1 || count > (this->len_ - offset)) - { count = this->len_ - offset; - } + return ACE_String_Base<CHAR> (&this->rep_[offset], count, this->allocator_); |