*** empty log message ***

10 files changed, 47 insertions, 45 deletions

diff --git a/ChangeLog-98a b/ChangeLog-98a
index 85699c82eef..22260600346 100644
--- a/ChangeLog-98a
+++ b/ChangeLog-98a
@@ -1,3 +1,21 @@
+Wed Dec 03 00:17:50 1997    <irfan@TWOSTEP>
+
+        * ACE: Removed the explicit iostream.h inclusion from these:
+
+	  examples/ASX/UPIPE_Event_Server/event_server.cpp
+	  examples/Log_Msg/test_log_msg.cpp
+	  examples/Logger/Acceptor-server/server_loggerd.cpp
+	  examples/Reactor/Misc/test_time_value.cpp
+	  examples/Shared_Malloc/test_persistence.cpp
+	  examples/Threads/task_three.cpp
+	  netsvcs/lib/Logging_Strategy.cpp
+	
+	* ace/IOStream.h: Darrell missed removing this explicit iostream.h
+ 	  inclusion.
+
+	* ace/Future.cpp: Removed template instantiation of Atomic_Op
+ 	  since Atomic_Op is not used by Future.
+
 Fri Dec 02 11:46:17 1997    <nw1@CHA-CHA>
 
 	* ace/Proactor.cpp (ACE_Proactor): Reenabled Proactor's thread
diff --git a/ace/Future.cpp b/ace/Future.cpp
index 75eee48a85f..879d627f2fb 100644
--- a/ace/Future.cpp
+++ b/ace/Future.cpp
@@ -311,16 +311,5 @@ ACE_Future<T>::operator &()
 {
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-// This should probably be moved elsewhere now that ACE_Atomic_Op<>
-// isn't used.
-template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-// This should probably be moved elsewhere now that ACE_Atomic_Op<>
-// isn't used.
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
 #endif /* ACE_HAS_THREADS */
 #endif /* ACE_FUTURE_CPP */
diff --git a/ace/IOStream.h b/ace/IOStream.h
index bc7460d1643..5b5c1a003b1 100644
--- a/ace/IOStream.h
+++ b/ace/IOStream.h
@@ -24,12 +24,6 @@
 #include "ace/INET_Addr.h"
 #include "ace/Handle_Set.h"
 
-#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
-# include /**/ <iostream.h>
-#else
-# include "ace/stdcpp.h"
-#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
-
 #if defined (ACE_HAS_STRING_CLASS)
 #if defined (ACE_WIN32)
 typedef CString ACE_IOStream_String;
diff --git a/examples/ASX/UPIPE_Event_Server/event_server.cpp b/examples/ASX/UPIPE_Event_Server/event_server.cpp
index 44840adcdfa..4e6dc23af95 100644
--- a/examples/ASX/UPIPE_Event_Server/event_server.cpp
+++ b/examples/ASX/UPIPE_Event_Server/event_server.cpp
@@ -10,10 +10,6 @@
 #include "ace/UPIPE_Acceptor.h"
 #include "ace/UPIPE_Connector.h"
 
-#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
-# include <iostream.h>
-#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
-
 #if defined (ACE_HAS_THREADS)
 
 typedef ACE_Stream<ACE_MT_SYNCH> MT_Stream;
diff --git a/examples/Log_Msg/test_log_msg.cpp b/examples/Log_Msg/test_log_msg.cpp
index 626124e1d38..7beef0e345d 100644
--- a/examples/Log_Msg/test_log_msg.cpp
+++ b/examples/Log_Msg/test_log_msg.cpp
@@ -20,10 +20,6 @@
 
 #include "ace/OS.h"
 
-#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
-# include <iostream.h>
-#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
-
 static void
 cleanup (void)
 {
diff --git a/examples/Logger/Acceptor-server/server_loggerd.cpp b/examples/Logger/Acceptor-server/server_loggerd.cpp
index d61cd44122d..ea6e27b20d6 100644
--- a/examples/Logger/Acceptor-server/server_loggerd.cpp
+++ b/examples/Logger/Acceptor-server/server_loggerd.cpp
@@ -12,11 +12,6 @@
 #include "ace/Synch.h"
 #include "ace/Singleton.h"
 
-#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
-# include <iostream.h>
-#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
-
-
 // ----------------------------------------
 
 class Options
diff --git a/examples/Reactor/Misc/test_time_value.cpp b/examples/Reactor/Misc/test_time_value.cpp
index 3ef8b537471..34d41713bb5 100644
--- a/examples/Reactor/Misc/test_time_value.cpp
+++ b/examples/Reactor/Misc/test_time_value.cpp
@@ -1,10 +1,6 @@
 // $Id$
 
 #include "ace/ACE.h"
-#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
-# include <iostream.h>
-#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
-
 
 inline int my_abs (int d) { return d > 0 ? d : -d; }
 
diff --git a/examples/Shared_Malloc/test_persistence.cpp b/examples/Shared_Malloc/test_persistence.cpp
index 04c7101c4de..4c70e161412 100644
--- a/examples/Shared_Malloc/test_persistence.cpp
+++ b/examples/Shared_Malloc/test_persistence.cpp
@@ -4,10 +4,6 @@
 
 #include "ace/Malloc.h"
 
-#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
-# include /**/ <iostream.h>
-#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
-
 typedef ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> MALLOC;
 typedef ACE_Malloc_Iterator <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> MALLOC_ITERATOR;
 
diff --git a/examples/Threads/task_three.cpp b/examples/Threads/task_three.cpp
index 89db19c8276..4ca4668023d 100644
--- a/examples/Threads/task_three.cpp
+++ b/examples/Threads/task_three.cpp
@@ -16,9 +16,21 @@
 #include "ace/Service_Config.h"
 #include "ace/Task.h"
 #include "ace/stdcpp.h"
+
+// Make sure we have fstream
 #if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
-# include <fstream.h>
-# include <iostream.h>
+# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
+#  include /**/ <fstream>
+
+#  if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \
+              (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0)
+    using std::ofstream;
+    using std::ios;
+#  endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
+
+# else /* ACE_HAS_STANDARD_CPP_LIBRARY */
+#  include /**/ <fstream.h>
+# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
 #endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
 
 #if defined (ACE_HAS_THREADS)
diff --git a/netsvcs/lib/Logging_Strategy.cpp b/netsvcs/lib/Logging_Strategy.cpp
index a5e2e0c18c2..d8b11450159 100644
--- a/netsvcs/lib/Logging_Strategy.cpp
+++ b/netsvcs/lib/Logging_Strategy.cpp
@@ -4,11 +4,21 @@
 #define ACE_BUILD_SVC_DLL
 #include "ace/Get_Opt.h"
 #include "Logging_Strategy.h"
-#if defined ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION
-# include <fstream.h>
-# include <iostream.h>
-#else
-# include "ace/stdcpp.h"
+
+// Make sure we have fstream
+#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
+# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
+#  include /**/ <fstream>
+
+#  if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \
+              (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0)
+    using std::ofstream;
+    using std::ios;
+#  endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
+
+# else /* ACE_HAS_STANDARD_CPP_LIBRARY */
+#  include /**/ <fstream.h>
+# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
 #endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
 
 // Parse the string containing all the flags and set the flags accordingly