Changed use of ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION in stdcpp.h

to include iostream when the above is #defined as 1.  Made
changes to other files to accommodate this change.

6 files changed, 26 insertions, 23 deletions

diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 0c814383921..f8beb9c6241 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -51,10 +51,6 @@ typedef ACE_INET_Addr ACE_LOG_MSG_IPC_ADDR;
 
 static ACE_LOG_MSG_IPC_STREAM *ACE_Log_Msg_message_queue = 0;
 
-#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
-# include /**/ <iostream.h>
-#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Log_Msg)
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h
index 0f032b7b357..c28ad54d59f 100644
--- a/ace/Log_Msg.h
+++ b/ace/Log_Msg.h
@@ -89,11 +89,6 @@
 
 #include "ace/Log_Record.h"
 
-// In case ace/stdcpp.h is not #included before this header . . .
-#if !defined(ACE_STDCPP_H)
-  class ostream;
-#endif
-
 #if defined (__Lynx__)
 # undef STDERR
 #endif
diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp
index d42639be9c4..d4eb72110ff 100644
--- a/ace/Log_Record.cpp
+++ b/ace/Log_Record.cpp
@@ -4,11 +4,7 @@
 #define ACE_BUILD_DLL
 #include "ace/Log_Record.h"
 
-#if defined ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION
-# include /**/ <iostream.h>
-#else
-# include "ace/stdcpp.h"
-#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
+#include "ace/stdcpp.h"
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Log_Record)
 
diff --git a/ace/Log_Record.h b/ace/Log_Record.h
index 9c87b573d01..ac6f4408ea7 100644
--- a/ace/Log_Record.h
+++ b/ace/Log_Record.h
@@ -22,11 +22,6 @@
 #if !defined (ACE_LOG_RECORD_H)
 #define ACE_LOG_RECORD_H
 
-// In case ace/stdcpp.h is not #included before this header . . .
-#if !defined(ACE_STDCPP_H) || defined(ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
-  class ostream;
-#endif
-
 class ACE_Export ACE_Log_Record
 {
   // = TITLE
diff --git a/ace/OS.h b/ace/OS.h
index d06bb7d6439..a38a64ca9c5 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -1664,10 +1664,6 @@ typedef u_int ACE_thread_key_t;
 
 #include "ace/stdcpp.h"
 
-#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
-class ostream;
-#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
-
 #include /**/ <fcntl.h>
 
 // This must come after signal.h is #included.
diff --git a/ace/stdcpp.h b/ace/stdcpp.h
index d1d118d5e41..794b90bf5c4 100644
--- a/ace/stdcpp.h
+++ b/ace/stdcpp.h
@@ -96,6 +96,31 @@
 #   endif /* ACE_WIN32 */
 
 # endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
+#else /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
+
+# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
+#   if defined (_MSC_VER)
+#     pragma warning(disable: 4018 4114 4146 4245)
+#     pragma warning(disable: 4663 4664 4665 4511 4512)
+#   endif /* _MSC_VER */
+
+#   include /**/ <iostream>
+
+#   if defined (_MSC_VER)
+#     pragma warning(4: 4018 4114 4146 4245)
+#     pragma warning(4: 4663 4664 4665 4512 4511)
+#   endif /* _MSC_VER */
+
+#   if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \
+               (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0)
+      using std::ostream;
+      using std::endl;
+      using std::cerr;
+#   endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
+# else /* ACE_HAS_STANDARD_CPP_LIBRARY */
+#   include /**/ <iostream.h>
+# endif
+
 #endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
 
 // Now include the new standard headers (like cstdio) if using the