ChangeLogTag: Mon Dec 20 00:21:50 1999 Balachandran Natarajan <bala@cs.wustl.edu>

17 files changed, 199 insertions, 61 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index d23a400cf6a..9701e1565cf 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,27 @@
+Mon Dec 20 00:21:50 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp: 
+	* orbsvcs/orbsvcs/Notify/ID_Pool_T.i:
+	* orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp:
+	* orbsvcs/orbsvcs/Notify/ID_Pool_T.h:
+	* orbsvcs/orbsvcs/Notify/NotifySubscribe_i.cpp:
+	* orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp:
+	* orbsvcs/orbsvcs/Notify/Notify_Dispatcher.cpp:
+	* orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp:
+	* orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp:
+	* orbsvcs/orbsvcs/Notify/Notify_Filter_i.h:
+	* orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp:
+	* orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp:
+	* orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp:
+	* orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
+	* orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp: Added missing
+	  template instantiations. It was nasty in the sense certain
+	  template instantiations were missing from the Trader
+	  set. Tracing them became a headache. 
+	
+	* orbsvcs/orbsvcs/Makefile: Added a file ID_Pool_T in the list of
+	  compiles. 
+
 Sun Dec 19 23:25:33 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
 
         * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:  Changed an instance
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index a8f6807c214..d10a329b60c 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -45,7 +45,7 @@ ifndef minimum_corba
 # Trader uses DynAny which is disabled when compiling with minimum
 # CORBA support.  LifeCycle depend on Trader so don't build
 # them either.
-  TAO_ORBSVCS += Trader LifeCycle Log
+  TAO_ORBSVCS += Trader LifeCycle Log 
 
 endif # minimum_corba
 
@@ -303,7 +303,8 @@ ifneq (,$(findstring Notify,$(TAO_ORBSVCS)))
         Notify/Notify_StructuredProxyPushSupplier_i \
         Notify/Notify_StructuredProxyPushConsumer_i \
         Notify/Notify_StructuredPushConsumer \
-        Notify/Notify_StructuredPushSupplier
+        Notify/Notify_StructuredPushSupplier \
+        Notify/ID_Pool_T
 
 #If the Trader is not being build, include the files that we need.
 ifeq (,$(findstring Trader,$(TAO_ORBSVCS)))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp
new file mode 100644
index 00000000000..1b8bb5e3f0c
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp
@@ -0,0 +1,14 @@
+//$Id$
+#include "ID_Pool_T.h"
+
+template <class ID_TYPE> void
+ID_Pool<ID_TYPE>::put (ID_TYPE /* id */)
+{
+  // TBD:
+}
+
+template <class ID_TYPE> ID_TYPE
+ID_Pool<ID_TYPE>::get (void)
+{
+   return ++id_;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.h b/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.h
index 31d922fb98e..dd31b55d933 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.h
@@ -40,8 +40,4 @@ class ID_Pool
   ID_TYPE id_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "ID_Pool_T.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* ID_POOL_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.i b/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.i
index 652529aa66e..598576b44a2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.i
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.i
@@ -1,13 +1,3 @@
 /* -*- C++ -*- $Id$ */
 
-template <class ID_TYPE> ACE_INLINE ID_TYPE
-ID_Pool<ID_TYPE>::get (void)
-{
-   return ++id_;
-}
 
-template <class ID_TYPE> ACE_INLINE void
-ID_Pool<ID_TYPE>::put (ID_TYPE /* id */)
-{
-  // TBD:
-}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/NotifySubscribe_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/NotifySubscribe_i.cpp
index 1639f3d6e18..c091240474a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/NotifySubscribe_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/NotifySubscribe_i.cpp
@@ -12,10 +12,10 @@ TAO_NotifySubscribe_i::~TAO_NotifySubscribe_i (void)
 }
 
 void TAO_NotifySubscribe_i::subscription_change (
-    const CosNotification::EventTypeSeq & added,
-    const CosNotification::EventTypeSeq & removed,
-    CORBA::Environment &ACE_TRY_ENV
-  )
+                                                 const CosNotification::EventTypeSeq & /*added*/,
+                                                 const CosNotification::EventTypeSeq & /*removed*/,
+                                                 CORBA::Environment & //ACE_TRY_ENV
+                                                 )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     CosNotifyComm::InvalidEventType
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
index d8ba44e4d70..3d030318e32 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
@@ -288,6 +288,7 @@ template class ACE_Hash_Map_Iterator_Base_Ex<CosNotifyChannelAdmin::ProxyID,TAO_
 template class ACE_Hash_Map_Reverse_Iterator<CosNotifyChannelAdmin::ProxyID,TAO_Notify_ProxySupplier_i*,ACE_SYNCH_MUTEX>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyChannelAdmin::ProxyID,TAO_Notify_ProxySupplier_i*,ACE_Hash<CosNotifyChannelAdmin::ProxyID>, ACE_Equal_To<CosNotifyChannelAdmin::ProxyID>, ACE_SYNCH_MUTEX>;
 
+template class ID_Pool<CosNotifyChannelAdmin::ProxyID>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Hash_Map_Entry<CosNotifyChannelAdmin::ProxyID,TAO_Notify_ProxySupplier_i*,ACE_SYNCH_MUTEX>
@@ -299,4 +300,5 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyChannelAdmin::ProxyID,T
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator<CosNotifyChannelAdmin::ProxyID,TAO_Notify_ProxySupplier_i*,ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyChannelAdmin::ProxyID,TAO_Notify_ProxySupplier_i*,ACE_Hash<CosNotifyChannelAdmin::ProxyID>, ACE_Equal_To<CosNotifyChannelAdmin::ProxyID>, ACE_SYNCH_MUTEX>
 
+#pragma instantiate ID_Pool<CosNotifyChannelAdmin::ProxyID>
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Dispatcher.cpp
index eacdb1c3c4a..09d85e60e06 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Dispatcher.cpp
@@ -95,8 +95,10 @@ Notify_Reactive_Dispatcher::dispatch_event (
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Unbounded_Set<TAO_Notify_Dispatcher *>;
 template class ACE_Unbounded_Set_Iterator<TAO_Notify_Dispatcher *>;
-//template class 
+template class ACE_Node <TAO_Notify_Dispatcher *>; 
+
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Unbounded_Set<TAO_Notify_Dispatcher *>
-#pragma instantiate  ACE_Unbounded_Set_Iterator<TAO_Notify_Dispatcher *>;
+#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_Dispatcher *>;
+#pragma instantiate ACE_Node <TAO_Notify_Dispatcher *>
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
index c9762a0af94..4f15551dda0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
@@ -62,7 +62,7 @@ TAO_Notify_EventChannel_i::MyFactory (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel_i::default_consumer_admin (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::default_consumer_admin (CORBA::Environment & /*ACE_TRY_ENV*/)
   ACE_THROW_SPEC ((CORBA::SystemException
                    ))
 {
@@ -81,7 +81,7 @@ CosNotifyChannelAdmin::SupplierAdmin_ptr TAO_Notify_EventChannel_i::default_supp
 
 CosNotifyFilter::FilterFactory_ptr
 TAO_Notify_EventChannel_i::default_filter_factory (
-                                                   CORBA::Environment &ACE_TRY_ENV
+                                                   CORBA::Environment & //ACE_TRY_ENV
                                                    )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -92,7 +92,7 @@ TAO_Notify_EventChannel_i::default_filter_factory (
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
 TAO_Notify_EventChannel_i::new_for_consumers
-(CosNotifyChannelAdmin::InterFilterGroupOperator op,
+(CosNotifyChannelAdmin::InterFilterGroupOperator /*op*/,
  CosNotifyChannelAdmin::AdminID_out id,
  CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((
@@ -132,7 +132,7 @@ TAO_Notify_EventChannel_i::new_for_consumers
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
 TAO_Notify_EventChannel_i::new_for_suppliers (
-CosNotifyChannelAdmin::InterFilterGroupOperator op,
+                                              CosNotifyChannelAdmin::InterFilterGroupOperator /*op*/,
 CosNotifyChannelAdmin::AdminID_out id,
 CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((
@@ -202,7 +202,7 @@ TAO_Notify_EventChannel_i::get_supplieradmin
 }
 
 CosNotifyChannelAdmin::AdminIDSeq * TAO_Notify_EventChannel_i::get_all_consumeradmins (
-                                                                                       CORBA::Environment &ACE_TRY_ENV
+                                                                                       CORBA::Environment & //ACE_TRY_ENV
                                                                                        )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -214,7 +214,7 @@ CosNotifyChannelAdmin::AdminIDSeq * TAO_Notify_EventChannel_i::get_all_consumera
 }
 
 CosNotifyChannelAdmin::AdminIDSeq * TAO_Notify_EventChannel_i::get_all_supplieradmins (
-                                                                                       CORBA::Environment &ACE_TRY_ENV
+                                                                                       CORBA::Environment & //ACE_TRY_ENV
                                                                                        )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -226,7 +226,7 @@ CosNotifyChannelAdmin::AdminIDSeq * TAO_Notify_EventChannel_i::get_all_suppliera
 }
 
 CosNotification::AdminProperties * TAO_Notify_EventChannel_i::get_admin (
-                                                                         CORBA::Environment &ACE_TRY_ENV
+                                                                         CORBA::Environment & //ACE_TRY_ENV
                                                                          )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -238,8 +238,8 @@ CosNotification::AdminProperties * TAO_Notify_EventChannel_i::get_admin (
 }
 
 void TAO_Notify_EventChannel_i::set_admin (
-                                           const CosNotification::AdminProperties & admin,
-                                           CORBA::Environment &ACE_TRY_ENV
+                                           const CosNotification::AdminProperties & /*admin*/,
+                                           CORBA::Environment & //ACE_TRY_ENV
                                            )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -251,7 +251,7 @@ void TAO_Notify_EventChannel_i::set_admin (
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr TAO_Notify_EventChannel_i::for_consumers (
-  CORBA::Environment &ACE_TRY_ENV
+                                                                                  CORBA::Environment & //ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -284,3 +284,50 @@ CosEventChannelAdmin::ConsumerAdmin_ptr TAO_Notify_EventChannel_i::for_consumers
   {
   //Add your implementation here
   }
+
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Hash_Map_Entry<CosNotifyChannelAdmin::AdminID, TAO_Notify_ConsumerAdmin_i *>;
+template class ACE_Hash_Map_Manager<CosNotifyChannelAdmin::AdminID, TAO_Notify_ConsumerAdmin_i *,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<CosNotifyChannelAdmin::AdminID, TAO_Notify_ConsumerAdmin_i *,ACE_Hash<CosNotifyChannelAdmin::AdminID>, ACE_Equal_To<CosNotifyChannelAdmin::AdminID>,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator<CosNotifyChannelAdmin::AdminID, TAO_Notify_ConsumerAdmin_i *,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<CosNotifyChannelAdmin::AdminID, TAO_Notify_ConsumerAdmin_i *,ACE_Hash<CosNotifyChannelAdmin::AdminID>, ACE_Equal_To<CosNotifyChannelAdmin::AdminID>,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<CosNotifyChannelAdmin::AdminID, TAO_Notify_ConsumerAdmin_i *,ACE_Hash<CosNotifyChannelAdmin::AdminID>, ACE_Equal_To<CosNotifyChannelAdmin::AdminID>,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator<CosNotifyChannelAdmin::AdminID, TAO_Notify_ConsumerAdmin_i *,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyChannelAdmin::AdminID, TAO_Notify_ConsumerAdmin_i *,ACE_Hash<CosNotifyChannelAdmin::AdminID>, ACE_Equal_To<CosNotifyChannelAdmin::AdminID>,ACE_SYNCH_MUTEX>;
+
+template class ACE_Hash_Map_Entry<CosNotifyChannelAdmin::AdminID, TAO_Notify_SupplierAdmin_i *>;
+template class ACE_Hash_Map_Manager<CosNotifyChannelAdmin::AdminID, TAO_Notify_SupplierAdmin_i *,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<CosNotifyChannelAdmin::AdminID, TAO_Notify_SupplierAdmin_i *,ACE_Hash<CosNotifyChannelAdmin::AdminID>, ACE_Equal_To<CosNotifyChannelAdmin::AdminID>,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator<CosNotifyChannelAdmin::AdminID, TAO_Notify_SupplierAdmin_i *,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<CosNotifyChannelAdmin::AdminID, TAO_Notify_SupplierAdmin_i *,ACE_Hash<CosNotifyChannelAdmin::AdminID>, ACE_Equal_To<CosNotifyChannelAdmin::AdminID>,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<CosNotifyChannelAdmin::AdminID, TAO_Notify_SupplierAdmin_i *,ACE_Hash<CosNotifyChannelAdmin::AdminID>, ACE_Equal_To<CosNotifyChannelAdmin::AdminID>,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator<CosNotifyChannelAdmin::AdminID, TAO_Notify_SupplierAdmin_i *,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyChannelAdmin::AdminID, TAO_Notify_SupplierAdmin_i *,ACE_Hash<CosNotifyChannelAdmin::AdminID>, ACE_Equal_To<CosNotifyChannelAdmin::AdminID>,ACE_SYNCH_MUTEX>;
+
+template class ID_Pool<CosNotifyChannelAdmin::AdminID>;
+//template class ID_Pool<CosNotifyChannelAdmin::AdminID>;
+
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Hash_Map_Entry<CosNotifyChannelAdmin::AdminID, TAO_Notify_ConsumerAdmin_i *>
+#pragma instantiate ACE_Hash_Map_Manager<CosNotifyChannelAdmin::AdminID, TAO_Notify_ConsumerAdmin_i *,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<CosNotifyChannelAdmin::AdminID, TAO_Notify_ConsumerAdmin_i *,ACE_Hash<CosNotifyChannelAdmin::AdminID>, ACE_Equal_To<CosNotifyChannelAdmin::AdminID>,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator<CosNotifyChannelAdmin::AdminID, TAO_Notify_ConsumerAdmin_i *,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<CosNotifyChannelAdmin::AdminID, TAO_Notify_ConsumerAdmin_i *,ACE_Hash<CosNotifyChannelAdmin::AdminID>, ACE_Equal_To<CosNotifyChannelAdmin::AdminID>,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CosNotifyChannelAdmin::AdminID, TAO_Notify_ConsumerAdmin_i *,ACE_Hash<CosNotifyChannelAdmin::AdminID>, ACE_Equal_To<CosNotifyChannelAdmin::AdminID>,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<CosNotifyChannelAdmin::AdminID, TAO_Notify_ConsumerAdmin_i *,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyChannelAdmin::AdminID, TAO_Notify_ConsumerAdmin_i *,ACE_Hash<CosNotifyChannelAdmin::AdminID>, ACE_Equal_To<CosNotifyChannelAdmin::AdminID>,ACE_SYNCH_MUTEX>
+
+#pragma instantiate ACE_Hash_Map_Entry<CosNotifyChannelAdmin::AdminID, TAO_Notify_SupplierAdmin_i *>
+#pragma instantiate ACE_Hash_Map_Manager<CosNotifyChannelAdmin::AdminID, TAO_Notify_SupplierAdmin_i *,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<CosNotifyChannelAdmin::AdminID, TAO_Notify_SupplierAdmin_i *,ACE_Hash<CosNotifyChannelAdmin::AdminID>, ACE_Equal_To<CosNotifyChannelAdmin::AdminID>,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator<CosNotifyChannelAdmin::AdminID, TAO_Notify_SupplierAdmin_i *,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<CosNotifyChannelAdmin::AdminID, TAO_Notify_SupplierAdmin_i *,ACE_Hash<CosNotifyChannelAdmin::AdminID>, ACE_Equal_To<CosNotifyChannelAdmin::AdminID>,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CosNotifyChannelAdmin::AdminID, TAO_Notify_SupplierAdmin_i *,ACE_Hash<CosNotifyChannelAdmin::AdminID>, ACE_Equal_To<CosNotifyChannelAdmin::AdminID>,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<CosNotifyChannelAdmin::AdminID, TAO_Notify_SupplierAdmin_i *,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyChannelAdmin::AdminID, TAO_Notify_SupplierAdmin_i *,ACE_Hash<CosNotifyChannelAdmin::AdminID>, ACE_Equal_To<CosNotifyChannelAdmin::AdminID>,ACE_SYNCH_MUTEX>
+
+#pragma instantiate ID_Pool<CosNotifyChannelAdmin::AdminID> 
+#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h
index 9bfecda4942..937b228c7e4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h
@@ -180,11 +180,13 @@ virtual void set_admin (
  protected:
   TAO_Notify_EventChannelFactory_i& my_factory_;
   // The factory that created us.
-
-  ID_Pool<CosNotifyChannelAdmin::AdminID> consumer_admin_ids;
+  
+  typedef ID_Pool<CosNotifyChannelAdmin::AdminID> IDGEN;
+  
+  IDGEN consumer_admin_ids;
   // Id generator for consumer admins.
 
-  ID_Pool<CosNotifyChannelAdmin::AdminID> supplier_admin_ids;
+  IDGEN supplier_admin_ids;
   // Id generator for supplier admins.
 
   ACE_Hash_Map_Manager <CosNotifyChannelAdmin::AdminID,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
index bbe37230928..f3b761e4f3f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
@@ -154,6 +154,7 @@ template class ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::FilterID,CosNotify
 template class ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_SYNCH_MUTEX>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_SYNCH_MUTEX>;
 
+template class ID_Pool<CosNotifyFilter::FilterID>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Hash_Map_Entry<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var>;
@@ -165,4 +166,5 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::FilterID,CosNot
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_SYNCH_MUTEX>
 
+#pragma instantiate ID_Pool<CosNotifyFilter::FilterID>
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
index 3c4e3ad79f0..afb9164102b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
@@ -428,6 +428,17 @@ template class ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::ConstraintID,TAO_N
 template class ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_SYNCH_MUTEX>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_MUTEX>;
 
+template class ID_Pool<CosNotifyFilter::ConstraintID>;
+
+//Suspicious.. I am just adding to keep CC5 happy
+template class ACE_Equal_To<CosNotifyFilter::ConstraintID>;
+//template class ID_Pool<int>;
+// May be I am wrong..
+
+//template class ID_Pool<CosNotifyFilter::ConstraintID>;
+
+template class ACE_Array<TAO_Notify_Filter_i::Notify_Constraint_Expr*>;
+template class ACE_Array_Base<TAO_Notify_Filter_i::Notify_Constraint_Expr*>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Hash_Map_Entry<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*>
@@ -439,4 +450,9 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::ConstraintID,TA
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_MUTEX>
 
+#pragma instantiate ID_Pool<CosNotifyFilter::ConstraintID>
+//#pragma instantiate ID_Pool<CosNotifyFilter::ConstraintID>
+
+#pragma instantiate ACE_Array<TAO_Notify_Filter_i::Notify_Constraint_Expr*>
+#pragma instantiate ACE_Array_Base<TAO_Notify_Filter_i::Notify_Constraint_Expr*>
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h
index c3187a07d73..f1fc391f5c9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h
@@ -156,16 +156,6 @@ virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (
     CORBA::SystemException
   ));
 
-private:
-  void add_constraints_i (
-    const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::InvalidConstraint
-                     ));
-
   struct Notify_Constraint_Expr{
     // = DESCRIPTION
     //   Structure for associating ConstraintInfo with an interpreter.
@@ -176,23 +166,33 @@ private:
     TAO_Notify_Constraint_Interpreter interpreter;
     // Constraint Interpreter.
   };
+private:
+  void add_constraints_i (
+    const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException,
+                     CosNotifyFilter::InvalidConstraint
+                     ));
+
 
   ID_Pool<CosNotifyFilter::ConstraintID> constraint_expr_ids_;
   // Id generator for ConstraintInfo's.
 
   ACE_Hash_Map_Manager <CosNotifyFilter::ConstraintID,
-                                         Notify_Constraint_Expr*,
+                                         TAO_Notify_Filter_i::Notify_Constraint_Expr*,
                                          ACE_SYNCH_MUTEX>
   constraint_expr_list_;
   // A list of the constraints stored in this filter.
 
   typedef ACE_Hash_Map_Iterator <CosNotifyFilter::ConstraintID,
-                                                  Notify_Constraint_Expr*,
+                                                  TAO_Notify_Filter_i::Notify_Constraint_Expr*,
                                                   ACE_SYNCH_MUTEX>
   CONSTRAINT_EXPR_LIST_ITER;
 
   typedef ACE_Hash_Map_Entry<CosNotifyFilter::ConstraintID,
-                                              Notify_Constraint_Expr*>
+                                              TAO_Notify_Filter_i::Notify_Constraint_Expr*>
   CONSTRAINT_EXPR_ENTRY;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp
index b82cdccf3b9..e2aaa7d7454 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp
@@ -13,19 +13,19 @@ TAO_Notify_QoSAdmin_i::~TAO_Notify_QoSAdmin_i (void)
   }
 
 CosNotification::QoSProperties * TAO_Notify_QoSAdmin_i::get_qos (
-    CORBA::Environment &ACE_TRY_ENV
-  )
+                                                                 CORBA::Environment & ///ACE_TRY_ENV
+                                                                 )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-  {
-    //Add your implementation here
-    return 0;
-  }
+                   CORBA::SystemException
+                   ))
+{
+  //Add your implementation here
+  return 0;
+}
 
 void TAO_Notify_QoSAdmin_i::set_qos (
-    const CosNotification::QoSProperties & qos,
-    CORBA::Environment &ACE_TRY_ENV
+                                     const CosNotification::QoSProperties & /*qos*/,
+                                     CORBA::Environment & //ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -37,9 +37,9 @@ void TAO_Notify_QoSAdmin_i::set_qos (
   }
 
 void TAO_Notify_QoSAdmin_i::validate_qos (
-    const CosNotification::QoSProperties & required_qos,
-    CosNotification::NamedPropertyRangeSeq_out available_qos,
-    CORBA::Environment &ACE_TRY_ENV
+                                          const CosNotification::QoSProperties & /*required_qos*/,
+                                          CosNotification::NamedPropertyRangeSeq_out /*available_qos*/,
+                                          CORBA::Environment & //ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
index 9ad3dc86099..337409e790f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
@@ -237,6 +237,7 @@ template class ACE_Hash_Map_Iterator_Base_Ex<CosNotifyChannelAdmin::ProxyID, TAO
 template class ACE_Hash_Map_Reverse_Iterator<CosNotifyChannelAdmin::ProxyID, TAO_Notify_ProxyConsumer_i*, ACE_SYNCH_MUTEX>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyChannelAdmin::ProxyID, TAO_Notify_ProxyConsumer_i*, ACE_Hash<CosNotifyChannelAdmin::ProxyID>,ACE_Equal_To<CosNotifyChannelAdmin::ProxyID>,ACE_SYNCH_MUTEX>;
 
+template class ID_Pool<CosNotifyChannelAdmin::ProxyID>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Hash_Map_Entry<CosNotifyChannelAdmin::ProxyID, TAO_Notify_ProxyConsumer_i*, ACE_SYNCH_MUTEX>
@@ -248,4 +249,5 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyChannelAdmin::ProxyID,
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator<CosNotifyChannelAdmin::ProxyID, TAO_Notify_ProxyConsumer_i*, ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyChannelAdmin::ProxyID, TAO_Notify_ProxyConsumer_i*, ACE_Hash<CosNotifyChannelAdmin::ProxyID>,ACE_Equal_To<CosNotifyChannelAdmin::ProxyID>,ACE_SYNCH_MUTEX>
 
+#pragma instantiate ID_Pool<CosNotifyChannelAdmin::ProxyID>
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index bffa95f569d..b4085c92917 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -1197,6 +1197,9 @@ template class ACE_Unbounded_Queue<TAO_Literal_Constraint>;
 template class ACE_Unbounded_Queue_Iterator<TAO_Literal_Constraint>;
 template CORBA::Boolean TAO_find (const CORBA::Any &, const int &);
 template CORBA::Boolean TAO_find (const CORBA::Any &, const unsigned char &);
+
+
+
 #if !defined (ACE_LACKS_FLOATING_POINT)
 template CORBA::Boolean TAO_find (const CORBA::Any &, const float &);
 template CORBA::Boolean TAO_find (const CORBA::Any &, const double &);
@@ -1214,6 +1217,9 @@ template CORBA::Boolean TAO_find (const CORBA::Any &, const unsigned int &);
 
 #pragma instantiate CORBA::Boolean TAO_find (const CORBA::Any &, const int &)
 #pragma instantiate CORBA::Boolean TAO_find (const CORBA::Any &, const unsigned char &)
+
+
+
 #if !defined (ACE_LACKS_FLOATING_POINT)
 #pragma instantiate CORBA::Boolean TAO_find (const CORBA::Any &, const float &)
 #pragma instantiate CORBA::Boolean TAO_find (const CORBA::Any &, const double &)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
index 4dd9e458cdd..40a779488d7 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
@@ -88,3 +88,37 @@ sequence_type (CORBA::TypeCode* type_code,
 
   return return_value;
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, CORBA::TypeCode *, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, CORBA::TypeCode *, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, CORBA::TypeCode *, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, CORBA::TypeCode *, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Entry<TAO_String_Hash_Key,CORBA_TypeCode*>;
+
+template class ACE_Hash<TAO_String_Hash_Key>;
+template class ACE_Equal_To<TAO_String_Hash_Key>;
+
+template class ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Entry<TAO_String_Hash_Key,int>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, CORBA::TypeCode *, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, CORBA::TypeCode *, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, CORBA::TypeCode *, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, CORBA::TypeCode *, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Entry<TAO_String_Hash_Key,CORBA_TypeCode*>
+
+#pragma instantiate ACE_Hash<TAO_String_Hash_Key>;
+#pragma instantiate ACE_Equal_To<TAO_String_Hash_Key>;
+
+#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Entry<TAO_String_Hash_Key,int>
+#endif /*ACE_HAS_TEMPLATE_INSTANTIATION */