ChangeLogTag:Thu Jul 16 15:06:46 1998 Carlos O'Ryan <coryan@cs.wustl.edu>

9 files changed, 23 insertions, 19 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 77824ba2a1b..bf8e354a3e1 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,19 @@
+Thu Jul 16 15:20:12 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* tao/Connect.cpp: 
+	* tao/ORB.cpp: 
+	  Set the close-on-exec flag using the new IPC_SAP interfaces.
+
+	* tao/ORB_Core.cpp: 
+	* orbsvcs/orbsvcs/Event/RT_Task.h: 
+	* orbsvcs/tests/EC_Multiple/EC_Multiple.h: 
+	* orbsvcs/tests/EC_Multiple/EC_Multiple.cpp: 
+	* orbsvcs/tests/EC_Mcast/EC_Mcast.h: 
+	* orbsvcs/tests/EC_Mcast/EC_Mcast.cpp: 
+	  Use ACE_SYNCH_CONDITION instead of
+	  ACE_Condition<ACE_Thread_Mutex> some template instantiations are
+	  removed.
+
 Thu Jul 16 15:15:46 1998  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
 
 	* orbsvcs/Makefile:
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
index 4470a8af24b..4a445d4c79c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
@@ -78,9 +78,6 @@ public:
 
 // ************************************************************
 
-// In Synch_T.h:
-// #define ACE_MT_SYNCH ACE_Thread_Mutex,ACE_Condition_Thread_Mutex
-
 typedef ACE_Task<ACE_SYNCH> ACE_ES_TASK;
 
 // quick hack to test dynamic queue performance (to be replaced soon)
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index b3a6c12d6f0..ea8e8c9c67b 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -1231,9 +1231,7 @@ main (int argc, char *argv [])
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Condition<ACE_Thread_Mutex>;
 template class ACE_PushConsumer_Adapter<ECM_Supplier>;
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Condition<ACE_Thread_Mutex>
 #pragma instantiate ACE_PushConsumer_Adapter<ECM_Supplier>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index 9663b7cc035..46aa7a3aaad 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -322,7 +322,7 @@ private:
 
   int ready_;
   ACE_SYNCH_MUTEX ready_mtx_;
-  ACE_Condition<ACE_SYNCH_MUTEX> ready_cnd_;
+  ACE_SYNCH_CONDITION ready_cnd_;
   // Before accepting any events the suppliers must wait for the test
   // to setup all the consumers.
   // The suppliers wait on the condition variable.
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 9fad4c0eeb2..b36fd975cbd 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -1599,12 +1599,10 @@ main (int argc, char *argv [])
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Auto_Basic_Ptr<POA_RtecScheduler::Scheduler>;
-template class ACE_Condition<ACE_Thread_Mutex>;
 template class ACE_PushConsumer_Adapter<Test_Supplier>;
 template class auto_ptr<POA_RtecScheduler::Scheduler>;
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Auto_Basic_Ptr<POA_RtecScheduler::Scheduler>
-#pragma instantiate ACE_Condition<ACE_Thread_Mutex>
 #pragma instantiate ACE_PushConsumer_Adapter<Test_Supplier>
 #pragma instantiate auto_ptr<POA_RtecScheduler::Scheduler>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index b9b727473e1..495671b3ddf 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -355,7 +355,7 @@ private:
 
   int ready_;
   ACE_SYNCH_MUTEX ready_mtx_;
-  ACE_Condition<ACE_SYNCH_MUTEX> ready_cnd_;
+  ACE_SYNCH_CONDITION ready_cnd_;
   // Before accepting any events the suppliers must wait for the test
   // to setup all the consumers.
   // The suppliers wait on the condition variable.
diff --git a/TAO/tao/Connect.cpp b/TAO/tao/Connect.cpp
index 260f87d3f9a..924ce689fbe 100644
--- a/TAO/tao/Connect.cpp
+++ b/TAO/tao/Connect.cpp
@@ -90,7 +90,7 @@ TAO_Server_Connection_Handler::open (void*)
     return -1;
 #endif /* TCP_NODELAY */
 
-  (void) ACE_OS::fcntl (this->peer ().get_handle (), F_SETFD, 1);
+  (void) this->peer ().enable (F_SETFD);
   // Set the close-on-exec flag for that file descriptor. If the
   // operation fails we are out of luck (some platforms do not support
   // it and return -1).
@@ -542,7 +542,7 @@ TAO_Client_Connection_Handler::open (void *)
                                 sizeof (nodelay)) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "NODELAY failed\n"), -1);
 
-  (void) ACE_OS::fcntl (this->peer ().get_handle (), F_SETFD, 1);
+  (void) this->peer ().enable (F_SETFD);
   // Set the close-on-exec flag for that file descriptor. If the
   // operation fails we are out of luck (some platforms do not support
   // it and return -1).
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 55433cb6f0f..04287edc6b8 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -149,6 +149,9 @@ CORBA_ORB::open (void)
   if (ocp->acceptor ()->acceptor ().get_local_addr (ocp->addr ()) == -1)
     return -1;
 
+  if (ocp->acceptor ()->acceptor ().enable (F_SETFD) == -1)
+    return -1;
+
   ocp->orb_params ()->addr (ocp->addr ());
   ocp->add_to_collocation_table ();
 
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index e9194fa2d1e..86e0a034509 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1365,10 +1365,6 @@ template class ACE_Singleton<TAO_GLOBAL_Collocation_Table, ACE_SYNCH_MUTEX>;
 template class ACE_Node<ACE_SYNCH_CONDITION*>;
 template class ACE_Unbounded_Set<ACE_SYNCH_CONDITION*>;
 template class ACE_Unbounded_Set_Iterator<ACE_SYNCH_CONDITION*>;
-# if !defined (ACE_HAS_TEMPLATE_TYPEDEFS)
-    template class ACE_Thread_Condition<ACE_Thread_Mutex>;
-    template class ACE_Condition<ACE_Thread_Mutex>;
-# endif /* ! ACE_HAS_TEMPLATE_TYPEDEFS */
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Env_Value<int>
 #pragma instantiate ACE_Env_Value<u_int>
@@ -1413,10 +1409,6 @@ template class ACE_Unbounded_Set_Iterator<ACE_SYNCH_CONDITION*>;
 #pragma instantiate ACE_Node<ACE_SYNCH_CONDITION*>
 #pragma instantiate ACE_Unbounded_Set<ACE_SYNCH_CONDITION*>
 #pragma instantiate ACE_Unbounded_Set_Iterator<ACE_SYNCH_CONDITION*>
-//# if !defined (ACE_HAS_TEMPLATE_TYPEDEFS)
-#   pragma instantiate ACE_Thread_Condition<ACE_Thread_Mutex>
-#   pragma instantiate ACE_Condition<ACE_Thread_Mutex>
-//# endif /* ! ACE_HAS_TEMPLATE_TYPEDEFS */
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 ACE_FACTORY_DEFINE (TAO, TAO_Resource_Factory)