diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-21 21:35:52 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-21 21:35:52 +0000 |
| commit | ba96086c1dc997154f6513d7638b3d588c7fde6d (patch) | |
| tree | b794de9330a8c72ad220e5d11fbb4237493e4f27 | |
| parent | 688a4b53d5ac4c56ade42951ad95f12e9322a0b2 (diff) | |
| download | ATCD-ba96086c1dc997154f6513d7638b3d588c7fde6d.tar.gz | |
don't #include ace/streams.h if ACE_LACKS_IOSTREAM_TOTALLY is #defined
| -rw-r--r-- | ace/Log_Record.cpp | 13 | ||||
| -rw-r--r-- | ace/SString.cpp | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp index ff577e89600..94eeb04f96b 100644 --- a/ace/Log_Record.cpp +++ b/ace/Log_Record.cpp @@ -1,12 +1,13 @@ -// Log_Record.cpp // $Id$ #define ACE_BUILD_DLL #include "ace/Log_Record.h" -#include "ace/streams.h" +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) +# include "ace/streams.h" +#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/Log_Record.i" +# include "ace/Log_Record.i" #endif ACE_RCSID(ace, Log_Record, "$Id$") @@ -153,11 +154,11 @@ ACE_Log_Record::format_msg (const ASYS_TCHAR *host_name, { # if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) const ASYS_TCHAR *lhost_name = (const ASYS_TCHAR *) ((host_name == 0) - ? ((char *) ASYS_TEXT ("<local_host>")) + ? ((char *) ASYS_TEXT ("<local_host>")) : ((char *) host_name)); # else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ const ASYS_TCHAR *lhost_name = ((host_name == 0) - ? ASYS_TEXT ("<local_host>") + ? ASYS_TEXT ("<local_host>") : host_name); # endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ ACE_OS::sprintf (verbose_msg, @@ -238,7 +239,7 @@ ACE_Log_Record::print (const ASYS_TCHAR *host_name, return result; } -#if ! defined (ACE_LACKS_IOSTREAM_TOTALLY) +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) int ACE_Log_Record::print (const ASYS_TCHAR *host_name, diff --git a/ace/SString.cpp b/ace/SString.cpp index 84d12bedf9a..36024b8d57d 100644 --- a/ace/SString.cpp +++ b/ace/SString.cpp @@ -3,12 +3,14 @@ #define ACE_BUILD_DLL #include "ace/Malloc.h" #if !defined (ACE_HAS_WINCE) -# include "ace/Service_Config.h" +# include "ace/Service_Config.h" #endif /* !ACE_HAS_WINCE */ #include "ace/SString.h" #include "ace/Auto_Ptr.h" -#include "ace/streams.h" +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) +# include "ace/streams.h" +#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ #if !defined (__ACE_INLINE__) #include "ace/SString.i" |