diff options
author | Erik Sohns <esohns@users.noreply.github.com> | 2023-04-06 11:09:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-06 11:09:11 +0200 |
commit | a3a7c2a50383ebf00534c28014704ce57e092821 (patch) | |
tree | 0de4a576c9929ac6d821462e1693882654f2a456 /TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp | |
parent | 5625244fd7bb77bafabce28fdec790f51ef50080 (diff) | |
parent | b50aba0fdce1069b9aa9b1baac9adee396663779 (diff) | |
download | ATCD-a3a7c2a50383ebf00534c28014704ce57e092821.tar.gz |
Merge branch 'master' into message_queue_ex_get_queue
Diffstat (limited to 'TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp')
-rw-r--r-- | TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp index 2f3c009efb1..f98ee2e1359 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp @@ -52,7 +52,7 @@ ACE_Test_Output::~ACE_Test_Output () ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM); ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR); -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && !defined (ACE_HAS_PHARLAP) +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) delete this->output_file_; #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ } @@ -66,13 +66,6 @@ ACE_Test_Output::output_file () int ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) { -#if defined (ACE_HAS_PHARLAP) - // For PharLap, just send it all to the host console for now - redirect - // to a file there for saving/analysis. - EtsSelectConsole(ETS_CO_HOST); - ACE_LOG_MSG->msg_ostream (&cout); - -#else ACE_TCHAR temp[MAXPATHLEN]; // Ignore the error value since the directory may already exist. const ACE_TCHAR *test_dir {}; @@ -139,8 +132,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ACE_LACKS_IOSTREAM_TOTALLY */ ACE_LOG_MSG->msg_ostream (this->output_file ()); -#endif /* ACE_HAS_PHARLAP */ - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER); ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); |