diff options
| author | Steve Huston <shuston@riverace.com> | 2004-12-15 22:10:28 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2004-12-15 22:10:28 +0000 |
| commit | 68961f193791024f867b84e135f1a807e57e17d3 (patch) | |
| tree | ff212d7fac7a0158fbfe1bc6defa44fc5cd42547 | |
| parent | 1910993949ec32f202dc72500591896f951896f2 (diff) | |
| download | ATCD-68961f193791024f867b84e135f1a807e57e17d3.tar.gz | |
ChangeLogTag:Wed Dec 15 17:05:22 2004 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | tests/Test_Output.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 6c59e55591c..d884265dc20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Dec 15 17:05:22 2004 Steve Huston <shuston@riverace.com> + + * tests/Test_Output.cpp: When resetting msg_ostream to cerr, specify + 0 for delete_ostream. ACE_Log_Msg is not allowed to delete cerr. + Fixes the crash in Logging_Strategy_Test. + Wed Dec 15 16:01:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * examples/APG/Active_Objects/active_objects.mwc: diff --git a/tests/Test_Output.cpp b/tests/Test_Output.cpp index 65f2da3bca9..7dbaa3cf4e1 100644 --- a/tests/Test_Output.cpp +++ b/tests/Test_Output.cpp @@ -50,7 +50,7 @@ ACE_Test_Output::~ACE_Test_Output (void) #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && !defined (ACE_PSOS) ACE_OSTREAM_TYPE *log_msg_stream = ACE_LOG_MSG->msg_ostream (); - ACE_LOG_MSG->msg_ostream (&cerr); + ACE_LOG_MSG->msg_ostream (&cerr, 0); #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY && ! ACE_PSOS */ ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM); @@ -177,7 +177,7 @@ ACE_Test_Output::close (void) this->output_file_->close (); delete this->output_file_; this->output_file_=0; - ACE_LOG_MSG->msg_ostream (this->output_file_); + ACE_LOG_MSG->msg_ostream (this->output_file_, 0); } // else something else changed the stream and hence should // have closed and deleted the output_file_ |