summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>1999-12-19 23:41:39 +0000
committerbala <balanatarajan@users.noreply.github.com>1999-12-19 23:41:39 +0000
commitdf50899ff6935b04e790b0388d8c9df77bef19e3 (patch)
tree0a953098483ab5214d4aa97d00c2f8eb790cc00a
parente9e3d1eb4968dd55ebcdc3ac41a50cb55348c496 (diff)
downloadATCD-df50899ff6935b04e790b0388d8c9df77bef19e3.tar.gz
ChangeLogTag: Sun Dec 19 17:36:07 1999 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog-99c13
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp18
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp23
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Dispatcher.cpp9
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp23
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp25
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp23
9 files changed, 133 insertions, 5 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 19e1aa648f8..f82fb85e61c 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,16 @@
+Sun Dec 19 17:36:07 1999 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp:
+ * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
+ * orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp:
+ * orbsvcs/orbsvcs/Notify/Notify_Dispatcher.cpp:
+ * orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp:
+ * orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_i.cpp:
+ * orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_i.cpp:
+ * orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp: Added missing
+ template instantiations.
+
+
Sun Dec 19 10:05:38 1999 David L. Levine <levine@cs.wustl.edu>
* orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp (remove_all_constraints):
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index 59269537cc8..206bf476747 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -53,7 +53,21 @@ visit_property (TAO_Property_Constraint* literal)
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
template class ACE_Hash_Map_Manager<ACE_CString, const CORBA::Any*, ACE_SYNCH_MUTEX>;
template class ACE_Hash_Map_Manager_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Entry <ACE_CString, const CORBA::Any*>;
+template class ACE_Hash_Map_Iterator<ACE_CString, const CORBA::Any*, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, const CORBA::Any*, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_SYNCH_MUTEX>;
+
#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, const CORBA::Any*, ACE_SYNCH_MUTEX>
-#pragma instantiate template class ACE_Hash_Map_Manager_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, const CORBA::Any*, ACE_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Entry <ACE_CString, const CORBA::Any*>;
+#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, const CORBA::Any*, ACE_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, const CORBA::Any*, ACE_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_SYNCH_MUTEX>;
+
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
index c6e8754dd5d..d8ba44e4d70 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
@@ -277,3 +277,26 @@ TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (
{
return 0;
}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Hash_Map_Entry <CosNotifyChannelAdmin::ProxyID,TAO_Notify_ProxySupplier_i*>;
+template class ACE_Hash_Map_Manager<CosNotifyChannelAdmin::ProxyID,TAO_Notify_ProxySupplier_i*,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<CosNotifyChannelAdmin::ProxyID,TAO_Notify_ProxySupplier_i*,ACE_Hash<CosNotifyChannelAdmin::ProxyID>, ACE_Equal_To<CosNotifyChannelAdmin::ProxyID>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator<CosNotifyChannelAdmin::ProxyID,TAO_Notify_ProxySupplier_i*,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<CosNotifyChannelAdmin::ProxyID,TAO_Notify_ProxySupplier_i*,ACE_Hash<CosNotifyChannelAdmin::ProxyID>, ACE_Equal_To<CosNotifyChannelAdmin::ProxyID>, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<CosNotifyChannelAdmin::ProxyID,TAO_Notify_ProxySupplier_i*,ACE_Hash<CosNotifyChannelAdmin::ProxyID>, ACE_Equal_To<CosNotifyChannelAdmin::ProxyID>, ACE_SYNCH_MUTEX>;
+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>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Hash_Map_Entry<CosNotifyChannelAdmin::ProxyID,TAO_Notify_ProxySupplier_i*,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager<CosNotifyChannelAdmin::ProxyID,TAO_Notify_ProxySupplier_i*,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<CosNotifyChannelAdmin::ProxyID,TAO_Notify_ProxySupplier_i*,ACE_Hash<CosNotifyChannelAdmin::ProxyID>, ACE_Equal_To<CosNotifyChannelAdmin::ProxyID>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator<CosNotifyChannelAdmin::ProxyID,TAO_Notify_ProxySupplier_i*,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<CosNotifyChannelAdmin::ProxyID,TAO_Notify_ProxySupplier_i*,ACE_Hash<CosNotifyChannelAdmin::ProxyID>, ACE_Equal_To<CosNotifyChannelAdmin::ProxyID>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CosNotifyChannelAdmin::ProxyID,TAO_Notify_ProxySupplier_i*,ACE_Hash<CosNotifyChannelAdmin::ProxyID>, ACE_Equal_To<CosNotifyChannelAdmin::ProxyID>, ACE_SYNCH_MUTEX>
+#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>
+
+#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 96701da9693..eacdb1c3c4a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Dispatcher.cpp
@@ -91,3 +91,12 @@ Notify_Reactive_Dispatcher::dispatch_event (
ACE_CHECK;
}
}
+
+#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
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Unbounded_Set<TAO_Notify_Dispatcher *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_Dispatcher *>;
+#endif
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
index 3a8065e405c..bbe37230928 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
@@ -143,3 +143,26 @@ TAO_Notify_FilterAdmin_i::remove_all_filters (
{
//Add your implementation here
}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Hash_Map_Entry<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var>;
+template class ACE_Hash_Map_Manager<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_SYNCH_MUTEX>;
+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>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Hash_Map_Entry<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var>;
+#pragma instantiate ACE_Hash_Map_Manager<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_SYNCH_MUTEX>
+#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>
+
+#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 5a523723601..3c4e3ad79f0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
@@ -2,7 +2,7 @@
#include "ace/Auto_Ptr.h"
#include "Notify_Filter_i.h"
-#include "Notify_Constraint_Visitors.h"
+#include "orbsvcs/Notify/Notify_Constraint_Visitors.h"
// Implementation skeleton constructor
TAO_Notify_Filter_i::TAO_Notify_Filter_i (void)
@@ -417,3 +417,26 @@ CosNotifyFilter::CallbackIDSeq * TAO_Notify_Filter_i::get_callbacks (
//Add your implementation here
return 0;
}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Hash_Map_Entry<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr *>;
+template class ACE_Hash_Map_Manager<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_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 ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_MUTEX>;
+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>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Hash_Map_Entry<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*>
+#pragma instantiate ACE_Hash_Map_Manager<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_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 ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_MUTEX>
+#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>
+
+#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_i.cpp
index b9f0118125f..bc1efbf6f4d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_i.cpp
@@ -30,7 +30,7 @@ CosNotifyChannelAdmin::ProxyType TAO_Notify_ProxyConsumer_i::MyType (
{
//Add your implementation here
- return 0;
+ return (CosNotifyChannelAdmin::ProxyType) 0;
}
CosNotifyChannelAdmin::SupplierAdmin_ptr TAO_Notify_ProxyConsumer_i::MyAdmin (
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_i.cpp
index b9b0d16b0ce..241f85af85b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_i.cpp
@@ -28,7 +28,7 @@ CosNotifyChannelAdmin::ProxyType TAO_Notify_ProxySupplier_i::MyType (
{
//Add your implementation here
- return 0;
+ return (CosNotifyChannelAdmin::ProxyType) 0;
}
CosNotifyChannelAdmin::ConsumerAdmin_ptr TAO_Notify_ProxySupplier_i::MyAdmin (
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
index 102c884faac..9ad3dc86099 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
@@ -226,3 +226,26 @@ TAO_Notify_SupplierAdmin_i::obtain_pull_consumer (
//Add your implementation here
return 0;
}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Hash_Map_Entry<CosNotifyChannelAdmin::ProxyID, TAO_Notify_ProxyConsumer_i*>;
+template class ACE_Hash_Map_Manager<CosNotifyChannelAdmin::ProxyID, TAO_Notify_ProxyConsumer_i*, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<CosNotifyChannelAdmin::ProxyID, TAO_Notify_ProxyConsumer_i*, ACE_Hash<CosNotifyChannelAdmin::ProxyID>,ACE_Equal_To<CosNotifyChannelAdmin::ProxyID>,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator<CosNotifyChannelAdmin::ProxyID, TAO_Notify_ProxyConsumer_i*, ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<CosNotifyChannelAdmin::ProxyID, TAO_Notify_ProxyConsumer_i*, ACE_Hash<CosNotifyChannelAdmin::ProxyID>,ACE_Equal_To<CosNotifyChannelAdmin::ProxyID>,ACE_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<CosNotifyChannelAdmin::ProxyID, TAO_Notify_ProxyConsumer_i*, ACE_Hash<CosNotifyChannelAdmin::ProxyID>,ACE_Equal_To<CosNotifyChannelAdmin::ProxyID>,ACE_SYNCH_MUTEX>;
+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>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Hash_Map_Entry<CosNotifyChannelAdmin::ProxyID, TAO_Notify_ProxyConsumer_i*, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager<CosNotifyChannelAdmin::ProxyID, TAO_Notify_ProxyConsumer_i*, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<CosNotifyChannelAdmin::ProxyID, TAO_Notify_ProxyConsumer_i*, ACE_Hash<CosNotifyChannelAdmin::ProxyID>,ACE_Equal_To<CosNotifyChannelAdmin::ProxyID>,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator<CosNotifyChannelAdmin::ProxyID, TAO_Notify_ProxyConsumer_i*, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<CosNotifyChannelAdmin::ProxyID, TAO_Notify_ProxyConsumer_i*, ACE_Hash<CosNotifyChannelAdmin::ProxyID>,ACE_Equal_To<CosNotifyChannelAdmin::ProxyID>,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CosNotifyChannelAdmin::ProxyID, TAO_Notify_ProxyConsumer_i*, ACE_Hash<CosNotifyChannelAdmin::ProxyID>,ACE_Equal_To<CosNotifyChannelAdmin::ProxyID>,ACE_SYNCH_MUTEX>
+#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>
+
+#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */