diff options
| author | Steve Huston <shuston@riverace.com> | 2004-11-29 23:01:47 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2004-11-29 23:01:47 +0000 |
| commit | 6c66e1aa84020e1c12c07e694e702f87132499ee (patch) | |
| tree | 2b62152da2d563ab88d1808283a54e9045211341 | |
| parent | 0d11ab40694ab051b6323d57b957a520349398be (diff) | |
| download | ATCD-6c66e1aa84020e1c12c07e694e702f87132499ee.tar.gz | |
ChangeLogTag:Mon Nov 29 17:56:39 2004 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | tests/Test_Output.cpp | 7 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 45e8d477d1d..66e9ba6bced 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Mon Nov 29 17:56:39 2004 Steve Huston <shuston@riverace.com> + + * tests/Test_Output.cpp: Re this change: + Fri Nov 19 18:19:19 2004 Steve Huston <shuston@riverace.com> + the reinterpret_cast<> breaks some stuff on LynxOS. So only do + reinterpret_cast on ACE_LACKS_IOSTREAM_TOTALLY, else use + dynamic_cast. This should fix LynXOS. Thanks to + Olli Savia <ops@iki.fi> for bringing this to my attention. + Mon Nov 29 14:10:12 2004 Chad Elliott <elliott_c@ociweb.com> * ace/ace.mpc: diff --git a/tests/Test_Output.cpp b/tests/Test_Output.cpp index 28ee79715e7..65f2da3bca9 100644 --- a/tests/Test_Output.cpp +++ b/tests/Test_Output.cpp @@ -70,8 +70,11 @@ ACE_Test_Output::output_file (void) // the output_file_ is given to ACE_LOG_MSG // and something else might destroy and/or change the stream // so return what ACE_LOG_MSG is using. - return reinterpret_cast<OFSTREAM*>( ACE_LOG_MSG->msg_ostream () ); - //return this->output_file_; +#if defined (ACE_LACKS_IOSTREAM_TOTALLY) + return reinterpret_cast<OFSTREAM*>(ACE_LOG_MSG->msg_ostream ()); +#else + return dynamic_cast<OFSTREAM*>(ACE_LOG_MSG->msg_ostream ()); +#endif /* ACE_LACKS_IOSTREAM_TOTALLY */ } int |