ChangeLogTag:Thu Apr 10 13:40:02 CEST 2003 Oliver Kellogg <oliver.kellogg@sysde.eads.net>

4 files changed, 33 insertions, 24 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e51c8714f3a..b5c0ec124b0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Thu Apr 10 13:40:02 CEST 2003  Oliver Kellogg  <oliver.kellogg@sysde.eads.net>
+
+	* orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
+	* orbsvcs/orbsvcs/Event/Event_Channel.{h,cpp}:
+
+	  Use ACE_Unbounded_Set_Ex instead of ACE_Unbounded_Set.
+	  This fixes bug 1465 for RTEC.
+
 Thu Apr 10 06:27:14 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* tao/orbconf.h:
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index 3694d31c2e2..ac2bc7de685 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -958,9 +958,9 @@ template class ACE_Unbounded_Queue_Iterator<ACE_Command_Base*>;
 template class TAO_ESF_Proxy_Collection<TAO_EC_ProxyPushConsumer>;
 template class TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>;
 template class TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>;
-template class ACE_Unbounded_Set<TAO_EC_ProxyPushConsumer *>;
+template class ACE_Unbounded_Set_Ex<TAO_EC_ProxyPushConsumer *>;
 template class ACE_Node<TAO_EC_ProxyPushConsumer *>;
-template class ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushConsumer *>;
+template class ACE_Unbounded_Set_Ex_Iterator<TAO_EC_ProxyPushConsumer *>;
 template class ACE_RB_Tree<TAO_EC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_EC_ProxyPushConsumer *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator<TAO_EC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_EC_ProxyPushConsumer *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Reverse_Iterator<TAO_EC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_EC_ProxyPushConsumer *>, ACE_Null_Mutex>;
@@ -985,9 +985,9 @@ template class TAO_ESF_Copy_On_Write_Collection<
 template class TAO_ESF_Proxy_Collection<TAO_EC_ProxyPushSupplier>;
 template class TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>;
 template class TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>;
-template class ACE_Unbounded_Set<TAO_EC_ProxyPushSupplier *>;
+template class ACE_Unbounded_Set_Ex<TAO_EC_ProxyPushSupplier *>;
 template class ACE_Node<TAO_EC_ProxyPushSupplier *>;
-template class ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushSupplier *>;
+template class ACE_Unbounded_Set_Ex_Iterator<TAO_EC_ProxyPushSupplier *>;
 template class ACE_RB_Tree<TAO_EC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_EC_ProxyPushSupplier *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator<TAO_EC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_EC_ProxyPushSupplier *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator_Base<TAO_EC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_EC_ProxyPushSupplier *>, ACE_Null_Mutex>;
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index b8a4f3184a8..96d6cb7843d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -41,12 +41,12 @@ template class ACE_Map_Reverse_Iterator<RtecEventChannelAdmin::Observer_Handle,
 template class ACE_Node<ACE_ES_Consumer_Rep *>;
 template class ACE_Node<ACE_Push_Consumer_Proxy *>;
 template class ACE_Node<ACE_Push_Supplier_Proxy *>;
-template class ACE_Unbounded_Set<ACE_ES_Consumer_Rep *>;
-template class ACE_Unbounded_Set<ACE_Push_Consumer_Proxy *>;
-template class ACE_Unbounded_Set<ACE_Push_Supplier_Proxy *>;
-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 *>;
+template class ACE_Unbounded_Set_Ex<ACE_ES_Consumer_Rep *>;
+template class ACE_Unbounded_Set_Ex<ACE_Push_Consumer_Proxy *>;
+template class ACE_Unbounded_Set_Ex<ACE_Push_Supplier_Proxy *>;
+template class ACE_Unbounded_Set_Ex_Iterator<ACE_ES_Consumer_Rep *>;
+template class ACE_Unbounded_Set_Ex_Iterator<ACE_Push_Consumer_Proxy *>;
+template class ACE_Unbounded_Set_Ex_Iterator<ACE_Push_Supplier_Proxy *>;
 
 template class ACE_Auto_Basic_Ptr<ACE_Push_Supplier_Proxy>;
 template class ACE_Auto_Basic_Ptr<ACE_Push_Consumer_Proxy>;
@@ -78,12 +78,12 @@ template class ACE_Array_Iterator<TAO_EC_Event>;
 #pragma instantiate ACE_Node<ACE_ES_Consumer_Rep *>
 #pragma instantiate ACE_Node<ACE_Push_Consumer_Proxy *>
 #pragma instantiate ACE_Node<ACE_Push_Supplier_Proxy *>
-#pragma instantiate ACE_Unbounded_Set<ACE_ES_Consumer_Rep *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Push_Consumer_Proxy *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Push_Supplier_Proxy *>
-#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_Unbounded_Set_Ex<ACE_ES_Consumer_Rep *>
+#pragma instantiate ACE_Unbounded_Set_Ex<ACE_Push_Consumer_Proxy *>
+#pragma instantiate ACE_Unbounded_Set_Ex<ACE_Push_Supplier_Proxy *>
+#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<ACE_ES_Consumer_Rep *>
+#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<ACE_Push_Consumer_Proxy *>
+#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<ACE_Push_Supplier_Proxy *>
 
 #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 f492c3a3c2d..f1b791d78a5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
@@ -29,6 +29,7 @@
 #include "ace/pre.h"
 
 #include "ace/Containers.h"
+#include "ace/Unbounded_Set_Ex.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -725,8 +726,8 @@ public:
   /// Free up dynamic resources.
   ~ACE_ES_Subscription_Info (void);
 
-  typedef ACE_Unbounded_Set_Iterator<ACE_ES_Consumer_Rep *> Subscriber_Set_Iterator;
-  typedef ACE_Unbounded_Set<ACE_ES_Consumer_Rep *> Subscriber_Set;
+  typedef ACE_Unbounded_Set_Ex_Iterator<ACE_ES_Consumer_Rep *> Subscriber_Set_Iterator;
+  typedef ACE_Unbounded_Set_Ex<ACE_ES_Consumer_Rep *> Subscriber_Set;
 
 /**
  * @class Type_Subscribers
@@ -1017,8 +1018,8 @@ public:
   void fill_qos (RtecEventChannelAdmin::ConsumerQOS& c_qos);
 
 private:
-  typedef ACE_Unbounded_Set_Iterator<ACE_Push_Consumer_Proxy *> Consumer_Iterator;
-  typedef ACE_Unbounded_Set<ACE_Push_Consumer_Proxy *> Consumers;
+  typedef ACE_Unbounded_Set_Ex_Iterator<ACE_Push_Consumer_Proxy *> Consumer_Iterator;
+  typedef ACE_Unbounded_Set_Ex<ACE_Push_Consumer_Proxy *> Consumers;
 
   /// Protects access to all_consumers_.
   ACE_ES_MUTEX lock_;
@@ -1226,8 +1227,8 @@ private:
   /// Next module down stream.
   ACE_ES_Supplier_Module *down_;
 
-  typedef ACE_Unbounded_Set_Iterator<ACE_Push_Supplier_Proxy *> Supplier_Iterator;
-  typedef ACE_Unbounded_Set<ACE_Push_Supplier_Proxy *> Suppliers;
+  typedef ACE_Unbounded_Set_Ex_Iterator<ACE_Push_Supplier_Proxy *> Supplier_Iterator;
+  typedef ACE_Unbounded_Set_Ex<ACE_Push_Supplier_Proxy *> Suppliers;
 
   /// All suppliers.
   Suppliers all_suppliers_;
@@ -1297,8 +1298,8 @@ public:
   void fill_qos (RtecEventChannelAdmin::SupplierQOS& s_qos);
 
 private:
-  typedef ACE_Unbounded_Set_Iterator<ACE_Push_Supplier_Proxy *> Supplier_Iterator;
-  typedef ACE_Unbounded_Set<ACE_Push_Supplier_Proxy *> Suppliers;
+  typedef ACE_Unbounded_Set_Ex_Iterator<ACE_Push_Supplier_Proxy *> Supplier_Iterator;
+  typedef ACE_Unbounded_Set_Ex<ACE_Push_Supplier_Proxy *> Suppliers;
 
   /// All suppliers.
   Suppliers all_suppliers_;