diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2003-10-24 22:36:37 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2003-10-24 22:36:37 +0000 |
| commit | d390310683291f5c63c6cdf4278e919a4409bb26 (patch) | |
| tree | e379fdd2068aa8d5905dd0844dbf8af4dc67bc87 | |
| parent | 83ba948c7276165ae0fbaa2d88cc0d78de522827 (diff) | |
| download | ATCD-d390310683291f5c63c6cdf4278e919a4409bb26.tar.gz | |
ChangeLogTag:Fri Oct 17 18:40:55 2003 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | THANKS | 4 | ||||
| -rw-r--r-- | ace/Log_Msg.cpp | 2 | ||||
| -rw-r--r-- | ace/config-win32-common.h | 5 |
4 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 5235aa9f3e8..0cf9da5b268 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Fri Oct 17 18:40:55 2003 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/Log_Msg.cpp: Modify the ACE_Log_Msg::dec() method to avoid + "going negative." Thanks to Matthieu Vansteene + <matthieu.vansteene@regis-dgac.net> for reporting this. + +Thu Oct 23 17:14:47 2003 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/config-win32-common.h: Fixed a problem whereby ACE_IOV_MAX + should have been 16 for Win 95/98/me. Thanks to Enrico Detoma + <enrico.detoma@email.it> for reporting this. + Fri Oct 24 11:27:52 2003 Venkita Subramonian <venkita@cs.wustl.edu> * ACE version 5.3.5 released. @@ -1762,8 +1762,12 @@ Jeff Dugan <jdugan@orincon.com> Jeff Mirwaisi <jeff_mirwaisi@yahoo.com> Alain Dupont <adupont@positron.qc.ca> Stephan Bettermann <sbetterm@erggroup.com> +David McKen <cic_3_b@yahoo.com> Adam Fanello <yahoo@fanello.net> +Matthieu Vansteene <matthieu.vansteene@regis-dgac.net> Sean Rooney <sro@zurich.ibm.com> +Enrico Detoma <enrico.detoma@email.it> +Onopin V. Mikhail <kool@garant.ru> 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/Log_Msg.cpp b/ace/Log_Msg.cpp index 345b616e253..2ed4b844043 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -2235,7 +2235,7 @@ ACE_Log_Msg::inc (void) int ACE_Log_Msg::dec (void) { - return --this->trace_depth_; + return this->trace_depth_ == 0 ? 0 : --this->trace_depth_; } int diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index cb68d3178d7..a7220408850 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -172,7 +172,12 @@ // excessively large. #if !defined (ACE_IOV_MAX) +#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) # define ACE_IOV_MAX 64 +#else +// Win 95/98/me need a smaller value than WinNT versions of Windows. +# define ACE_IOV_MAX 16 +#endif /* #if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) #endif /* ACE_IOV_MAX */ #if !defined (ACE_HAS_WINCE) |