diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-07-15 14:27:12 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-07-15 14:27:12 +0000 |
| commit | 7c26cae2449e842373d7682e48522e807e0b2a75 (patch) | |
| tree | 291df18c6752eea15cd753aa7bf2c6badf5c740c | |
| parent | 543e178ae44975483e678b38d028a32a52944e13 (diff) | |
| download | ATCD-7c26cae2449e842373d7682e48522e807e0b2a75.tar.gz | |
ChangeLogTag:Mon Jul 15 09:26:17 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | ace/SString.cpp | 6 |
4 files changed, 16 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index f40bbbbd502..a1662918d9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jul 15 09:26:17 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/SString.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 10:14:44 2002 Carlos O'Ryan <coryan@atdesk.com> * bin/MakeProjectCreator/README: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index f40bbbbd502..a1662918d9f 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Mon Jul 15 09:26:17 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/SString.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 10:14:44 2002 Carlos O'Ryan <coryan@atdesk.com> * bin/MakeProjectCreator/README: @@ -1543,6 +1543,7 @@ Michael Hornok <Michael.Hornok@alcatel.com> W.M. van den Boogaard <wim.vd.boogaard@meco.nl> Carol Hunsicker <carol.hunsicker@lmco.com> Joseph Sarbak <joseph_t_sarbak@hotmail.com> +Ruslan Zasukhin <sunshine@public.kherson.ua> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ace/SString.cpp b/ace/SString.cpp index 8a3b3b07db3..b839283409d 100644 --- a/ace/SString.cpp +++ b/ace/SString.cpp @@ -504,16 +504,16 @@ ACE_SString ACE_SString::substring (size_t offset, ssize_t length) const { - ACE_SString nil; + ACE_SString nill; size_t count = length; // case 1. empty string if (len_ == 0) - return nil; + return nill; // case 2. start pos l if (offset >= len_) - return nil; + return nill; // get all remaining bytes if (length == -1) |