ChangeLogTag:Mon Oct 12 11:30:38 1998 Carlos O'Ryan <coryan@cs.wustl.edu>

5 files changed, 46 insertions, 24 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 760660a9ca9..92a56210a20 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,15 @@
+Mon Oct 12 11:30:38 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* orbsvcs/orbsvcs/Event/Event_Channel.h: 
+	* orbsvcs/orbsvcs/Event/Event_Channel.i: 
+	* orbsvcs/orbsvcs/Event/Event_Channel.cpp: 
+	* orbsvcs/orbsvcs/Event/Memory_Pools.cpp: 
+	  Removed some template instantiations that were not used anymore.
+	  Moved the template instantiations related to memory pool from
+	  Event_Channel.cpp into Memory_Pools.cpp
+	  Added a comparison operator for the TAO_EC_Event class, this is
+	  needed to complete the instantiation of ACE_Array<TAO_EC_Event>.
+
 Mon Oct 12 10:31:35 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/Naming/CosNaming_i: Removed the need to allocate
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index f35c6b81a51..17fdb2badba 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -2455,7 +2455,7 @@ ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source,
   ACE_ES_Subscription_Info::Subscriber_Map &supplier_map =
     source->subscription_info ().type_subscribers_;
 
-  Subscriber_Set disconnect_list;
+  ACE_ES_Subscription_Info::Subscriber_Set disconnect_list;
 
   ACE_ES_Subscription_Info::Subscriber_Set *set;
 
@@ -2532,7 +2532,8 @@ ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source,
                            "ACE_ES_Subscription_Module::"
                            "push_source.\n"), -1);
 
-      for (Subscriber_Set_Iterator iter = disconnect_list.begin (),
+      for (ACE_ES_Subscription_Info::Subscriber_Set_Iterator iter =
+	     disconnect_list.begin (),
              disconnect_list_end = disconnect_list.end ();
            iter != disconnect_list_end;
            iter++)
@@ -3316,18 +3317,6 @@ template class ACE_Unbounded_Set_Iterator<ACE_ES_Consumer_Rep *>;
 template class ACE_Unbounded_Set_Iterator<ACE_Push_Consumer_Proxy *>;
 template class ACE_Unbounded_Set_Iterator<ACE_Push_Supplier_Proxy *>;
 
-// For ACE_ES_Event_Container_Allocator.
-template class ACE_Cached_Allocator<ACE_ES_Event_Container_Chunk, ACE_MEMORY_POOL_MUTEX>;
-template class ACE_Cached_Allocator<ACE_ES_Event_Container_Chunk, ACE_SYNCH_MUTEX>;
-template class ACE_Cached_Allocator<ACE_ES_Dispatch_Request_Chunk, ACE_MEMORY_POOL_MUTEX>;
-template class ACE_Cached_Mem_Pool_Node<ACE_ES_Event_Container_Chunk>;
-template class ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk>;
-template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Event_Container_Chunk>, ACE_Null_Mutex>;
-template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Event_Container_Chunk>, ACE_Thread_Mutex>;
-template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk>, ACE_Null_Mutex>;
-template class ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Event_Container_Chunk> >;
-template class ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk> >;
-
 template class ACE_Auto_Basic_Ptr<ACE_Push_Supplier_Proxy>;
 template class ACE_Auto_Basic_Ptr<ACE_Push_Consumer_Proxy>;
 template class auto_ptr<ACE_Push_Supplier_Proxy>;
@@ -3363,16 +3352,6 @@ template class ACE_Array_Iterator<TAO_EC_Event>;
 #pragma instantiate ACE_Unbounded_Set_Iterator<ACE_ES_Consumer_Rep *>
 #pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Push_Consumer_Proxy *>
 #pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Push_Supplier_Proxy *>
-#pragma instantiate ACE_Cached_Allocator<ACE_ES_Event_Container_Chunk, ACE_MEMORY_POOL_MUTEX>
-#pragma instantiate ACE_Cached_Allocator<ACE_ES_Event_Container_Chunk, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Cached_Allocator<ACE_ES_Dispatch_Request_Chunk, ACE_MEMORY_POOL_MUTEX>
-#pragma instantiate ACE_Cached_Mem_Pool_Node<ACE_ES_Event_Container_Chunk>
-#pragma instantiate ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk>
-#pragma instantiate ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Event_Container_Chunk>, ACE_Null_Mutex>
-#pragma instantiate ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Event_Container_Chunk>, ACE_Thread_Mutex>
-#pragma instantiate ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk>, ACE_Null_Mutex>
-#pragma instantiate ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Event_Container_Chunk> >
-#pragma instantiate ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk> >
 
 #pragma instantiate ACE_Auto_Basic_Ptr<ACE_Push_Supplier_Proxy>
 #pragma instantiate ACE_Auto_Basic_Ptr<ACE_Push_Consumer_Proxy>
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
index 0c58ffeb753..2203852802e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
@@ -76,6 +76,17 @@ ACE_INLINE int operator == (const RtecEventComm::Event &event1,
 
 // ************************************************************
 
+// = TITLE
+//   Compare two TAO_EC_Events.
+//
+// = DESCRIPTION
+//   This is only used in the instantiation of ACE_Array<TAO_EC_Event>
+//
+ACE_INLINE
+int operator != (const TAO_EC_Event &rhs, const TAO_EC_Event &lhs);
+
+// ************************************************************
+
 // = DESCRIPTION
 //   Utility for debugging events.
 void TAO_ORBSVCS_Export dump_event (const RtecEventComm::Event &event);
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
index e22a90507e0..982f739d168 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
@@ -149,6 +149,18 @@ operator == (const RtecEventComm::Event &event1,
   return 1;
 }
 
+ACE_INLINE int
+operator != (const TAO_EC_Event& rhs, const TAO_EC_Event& lhs)
+{
+  if (rhs.empty () && lhs.empty ())
+    return 1;
+  if (rhs.empty () || lhs.empty ())
+    return 0;
+  return ! (rhs.event () == lhs.event ());
+}
+
+
+
 // ************************************************************
 
 ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.cpp b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.cpp
index bcd540ed8b9..9b0da7996b3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.cpp
@@ -26,10 +26,18 @@ ACE_ES_Memory_Pools::thr_init (void)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
+template class ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk>;
+template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk>, ACE_Null_Mutex>;
+template class ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk> >;
+template class ACE_Cached_Allocator<ACE_ES_Dispatch_Request_Chunk, ACE_MEMORY_POOL_MUTEX>;
 template class ACE_Singleton<ACE_ES_Dispatch_Request_Allocator,ACE_SYNCH_MUTEX>;
 
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
+#pragma instantiate ACE_Cached_Allocator<ACE_ES_Dispatch_Request_Chunk, ACE_MEMORY_POOL_MUTEX>
+#pragma instantiate ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk>
+#pragma instantiate ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk>, ACE_Null_Mutex>
+#pragma instantiate ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk> >
 #pragma instantiate ACE_Singleton<ACE_ES_Dispatch_Request_Allocator,ACE_SYNCH_MUTEX>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */