10 files changed, 46 insertions, 31 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp
index 1b8bb5e3f0c..277ba37968b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp
@@ -1,6 +1,10 @@
 //$Id$
 #include "ID_Pool_T.h"
 
+#if !defined (__ACE_INLINE__)
+#include "ID_Pool_T.i"
+#endif /* __ACE_INLINE__ */
+
 template <class ID_TYPE> void
 ID_Pool<ID_TYPE>::put (ID_TYPE /* id */)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.h b/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.h
index dd31b55d933..78530c9e8b8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.h
@@ -40,4 +40,17 @@ class ID_Pool
   ID_TYPE id_;
 };
 
+#if defined (__ACE_INLINE__)
+#include "ID_Pool_T.i"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "ID_Pool_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("ID_Pool.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+
 #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 598576b44a2..166c9e2f6d0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.i
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.i
@@ -1,3 +1,5 @@
 /* -*- C++ -*- $Id$ */
 
 
+
+
diff --git a/TAO/orbsvcs/orbsvcs/Notify/NotifyPublish_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/NotifyPublish_i.cpp
index ba92ccfbc96..ee9e96a5031 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/NotifyPublish_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/NotifyPublish_i.cpp
@@ -12,9 +12,9 @@ TAO_NotifyPublish_i::~TAO_NotifyPublish_i (void)
 }
 
 void TAO_NotifyPublish_i::offer_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,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
index 3d030318e32..d526f49baa3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
@@ -288,7 +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>;
+//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>
@@ -300,5 +300,5 @@ template class ID_Pool<CosNotifyChannelAdmin::ProxyID>;
 #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>
+//#pragma instantiate ID_Pool<CosNotifyChannelAdmin::ProxyID>
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
index 4f15551dda0..12662e526c8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
@@ -70,7 +70,7 @@ TAO_Notify_EventChannel_i::default_consumer_admin (CORBA::Environment & /*ACE_TR
   return 0;
 }
 
-CosNotifyChannelAdmin::SupplierAdmin_ptr TAO_Notify_EventChannel_i::default_supplier_admin (CORBA::Environment &ACE_TRY_ENV)
+CosNotifyChannelAdmin::SupplierAdmin_ptr TAO_Notify_EventChannel_i::default_supplier_admin (CORBA::Environment & /*ACE_TRY_ENV*/ )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -263,7 +263,7 @@ CosEventChannelAdmin::ConsumerAdmin_ptr TAO_Notify_EventChannel_i::for_consumers
   }
 
   CosEventChannelAdmin::SupplierAdmin_ptr TAO_Notify_EventChannel_i::for_suppliers (
-  CORBA::Environment &ACE_TRY_ENV
+                                                                                    CORBA::Environment & //ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -275,7 +275,7 @@ CosEventChannelAdmin::ConsumerAdmin_ptr TAO_Notify_EventChannel_i::for_consumers
   }
 
   void TAO_Notify_EventChannel_i::destroy (
-  CORBA::Environment &ACE_TRY_ENV
+                                           CORBA::Environment & //ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
   CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
index f3b761e4f3f..45d7443a973 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
@@ -154,7 +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>;
+//template class ID_Pool<CosNotifyFilter::FilterID>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Hash_Map_Entry<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var>;
@@ -166,5 +166,5 @@ template class ID_Pool<CosNotifyFilter::FilterID>;
 #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>
+//#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 afb9164102b..95a2945d085 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
@@ -428,17 +428,12 @@ 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*>
@@ -450,9 +445,7 @@ template class ACE_Array_Base<TAO_Notify_Filter_i::Notify_Constraint_Expr*>;
 #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 f1fc391f5c9..a4fccdce3be 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h
@@ -156,16 +156,7 @@ virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (
     CORBA::SystemException
   ));
 
-  struct Notify_Constraint_Expr{
-    // = DESCRIPTION
-    //   Structure for associating ConstraintInfo with an interpreter.
-    //
-    CosNotifyFilter::ConstraintExp constr_expr;
-    // Constraint Expression.
-
-    TAO_Notify_Constraint_Interpreter interpreter;
-    // Constraint Interpreter.
-  };
+
 private:
   void add_constraints_i (
     const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq,
@@ -177,6 +168,18 @@ private:
                      ));
 
 
+    struct Notify_Constraint_Expr
+    {
+      // = DESCRIPTION
+      //   Structure for associating ConstraintInfo with an interpreter.
+      //
+      CosNotifyFilter::ConstraintExp constr_expr;
+      // Constraint Expression.
+      
+      TAO_Notify_Constraint_Interpreter interpreter;
+      // Constraint Interpreter.
+    };
+  
   ID_Pool<CosNotifyFilter::ConstraintID> constraint_expr_ids_;
   // Id generator for ConstraintInfo's.
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
index 337409e790f..b1c2ad8341d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
@@ -237,7 +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>;
+//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>
@@ -249,5 +249,5 @@ template class ID_Pool<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>
+//#pragma instantiate ID_Pool<CosNotifyChannelAdmin::ProxyID>
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */