summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-08-10 00:33:41 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-08-10 00:33:41 +0000
commitdb8defb49f75b30f2b84a624bcfbddc9f970315f (patch)
treefb2cd1c847ebb0a62eca768e213bcfe595623556
parent0eb064b7c258110a0fc358dc3ee34708a8e4edf6 (diff)
downloadATCD-db8defb49f75b30f2b84a624bcfbddc9f970315f.tar.gz
ChangeLogTag:Sun Aug 9 19:08:53 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog-98c7
-rw-r--r--TAO/tao/ORB.cpp2
2 files changed, 9 insertions, 0 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 61a3f9f18a1..3a6cd6176d9 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -6,6 +6,13 @@ Sun Aug 9 19:08:53 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
corresponding ACE_Allocator_Adapter<> because it is already
instantiated in ACE.
+ * tao/ORB.cpp:
+ Added missing instantiation of
+ ACE_Guard<ACE_Cached_Connector_Lock>, event it is not directly
+ used in TAO it is used by the ACE_Cached_Connector<> (when
+ instantiated using that lock) and some compilers do no recursive
+ instantiation.
+
Sun Aug 9 18:20:59 1998 Darrell Brunsch <brunsch@cs.wustl.edu>
* tests/Simple/client_static.dsp:
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 732c56493fb..8f126ad675a 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -875,6 +875,7 @@ template class TAO_Unbounded_Sequence<CORBA::Octet>;
template class ACE_Dynamic_Service<TAO_Server_Strategy_Factory>;
template class ACE_Dynamic_Service<TAO_Client_Strategy_Factory>;
template class ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR, TAO_Cached_Connector_Lock>;
+template class ACE_Guard<TAO_Cached_Connector_Lock>;
template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_int>;
template class ACE_Hash_Map_Entry<TAO_HASH_RECYCLABLE_ADDR, TAO_Client_Connection_Handler *>;
template class ACE_Hash_Map_Manager<TAO_HASH_RECYCLABLE_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_MUTEX>;
@@ -895,6 +896,7 @@ template class ACE_Hash_Map_Reverse_Iterator<TAO_HASH_RECYCLABLE_ADDR, TAO_Clien
#pragma instantiate ACE_Dynamic_Service<TAO_Server_Strategy_Factory>
#pragma instantiate ACE_Dynamic_Service<TAO_Client_Strategy_Factory>
#pragma instantiate ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR, TAO_Cached_Connector_Lock>
+#pragma instantiate ACE_Guard<TAO_Cached_Connector_Lock>
#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_int>
//#pragma instantiate TAO_HASH_RECYCLABLE_ADDR
#pragma instantiate ACE_Hash_Map_Entry<TAO_HASH_RECYCLABLE_ADDR, TAO_Client_Connection_Handler *>