ChangeLogTag: Thu Jul 22 10:25:31 1999 David L. Levine <levine@cs.wustl.edu>

3 files changed, 34 insertions, 25 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index 6506697dfef..198bf977564 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,9 @@
+Thu Jul 22 10:25:31 1999  David L. Levine  <levine@cs.wustl.edu>
+
+        * ace/Log_Record.cpp,SString.cpp: wrapped #include of
+          ace/streams.h with #ifndef ACE_LACKS_IOSTREAMS_TOTALLY.
+          [Bug 84]
+
 Thu Jul 22 09:55:10 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * docs/ACE-guidelines.html: updated commit message guideline
@@ -5,31 +11,31 @@ Thu Jul 22 09:55:10 1999  David L. Levine  <levine@cs.wustl.edu>
 
 Thu Jul 22 02:15:46 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-	* ace/Handle_Gobbler (class ACE_Handle_Gobbler): New class that
-	  gobbles up handles :) This class is useful when we need to
-	  control the number of handles available for a process.  Mostly
-	  used for testing purposes.
+        * ace/Handle_Gobbler (class ACE_Handle_Gobbler): New class that
+          gobbles up handles :) This class is useful when we need to
+          control the number of handles available for a process.  Mostly
+          used for testing purposes.
 
-	  Note that even though the new files are in the ace directory,
-	  they are not part of the ace library.  The files only contain
-	  inline functions and Handle_Gobbler.h is only included where
-	  needed.
+          Note that even though the new files are in the ace directory,
+          they are not part of the ace library.  The files only contain
+          inline functions and Handle_Gobbler.h is only included where
+          needed.
 
-	* tests/Cached_Conn_Test.cpp:
-	* tests/Cached_Accept_Conn_Test.cpp:
+        * tests/Cached_Conn_Test.cpp:
+        * tests/Cached_Accept_Conn_Test.cpp:
 
-	  Added Handle_Gobbler to the test to reduce the iterations
-	  required before handles run out and purging starts.
+          Added Handle_Gobbler to the test to reduce the iterations
+          required before handles run out and purging starts.
 
 Wed Jul 21 21:45:22 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* ace/Reactor.cpp: Applied ACE_NOTREACHED to several
-	  run_*_event_loop methods.
+        * ace/Reactor.cpp: Applied ACE_NOTREACHED to several
+          run_*_event_loop methods.
 
-	* docs/ACE-guidelines.html: Updated ASYS_TEXT usage.
+        * docs/ACE-guidelines.html: Updated ASYS_TEXT usage.
 
-	* ace/RB_Tree.cpp:
-	* tests/Cache_Map_Manager_Test.cpp: Applied ASYS_TEXT liberally.
+        * ace/RB_Tree.cpp:
+        * tests/Cache_Map_Manager_Test.cpp: Applied ASYS_TEXT liberally.
 
 Wed Jul 21 21:19:36 1999  David L. Levine  <levine@cs.wustl.edu>
 
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"