diff options
| -rw-r--r-- | ChangeLog-99b | 6 | ||||
| -rw-r--r-- | tests/test_config.h | 15 |
2 files changed, 7 insertions, 14 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 1e9f1ada298..e1ceb66f2be 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,9 @@ +Tue Dec 28 15:50:46 1999 David L. Levine <levine@cs.wustl.edu> + + * tests/test_config.h (set_output): removed the flags + local variable, with its conditionally compiled type + determination. The absorbed code is much cleaner. + Tue Dec 28 15:37:11 1999 Chris Gill <cdgill@cs.wustl.edu> * ace/Log_Msg.cpp diff --git a/tests/test_config.h b/tests/test_config.h index c6f2079164b..0d07b378b4a 100644 --- a/tests/test_config.h +++ b/tests/test_config.h @@ -287,21 +287,8 @@ ACE_Test_Output::set_output (const ASYS_TCHAR *filename, int append) # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -# if defined (__USE_STD_IOSTREAM) - // Compaq cxx X6.3/Linux needs this. - std::ios_base::openmode -# else /* ! __USE_STD_IOSTREAM */ - int -# endif /* ! __USE_STD_IOSTREAM */ - flags = ios::out; - - if (append) - flags |= ios::app; - else - flags |= ios::trunc; - this->output_file_->open (ASYS_ONLY_MULTIBYTE_STRING (temp), - flags); + ios::out | (append ? ios::app : ios::trunc)); if (this->output_file_->bad ()) return -1; #else /* when ACE_LACKS_IOSTREAM_TOTALLY */ |