diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-21 23:18:32 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-21 23:18:32 +0000 |
| commit | 9b9fd1799f4cdc8cb3db537a6a6ee897fea2b78d (patch) | |
| tree | bb9fc3d48af8fd2b59d95c04a52dcaa4c030f1be | |
| parent | 7d87ab51b163c7bd0fd99795ee4e9996c351f64f (diff) | |
| download | ATCD-9b9fd1799f4cdc8cb3db537a6a6ee897fea2b78d.tar.gz | |
ChangeLogTag:Mon Sep 21 18:15:13 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 7 | ||||
| -rw-r--r-- | TAO/tao/Connect.cpp | 15 | ||||
| -rw-r--r-- | TAO/tao/ORB.cpp | 3 |
3 files changed, 15 insertions, 10 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index bddacbcb170..5963552155a 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,10 @@ +Mon Sep 21 18:15:13 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/ORB.cpp: + * tao/Connect.cpp: + Fixed template instantiations, thanks to Irfan for his help + tracking this down. + Mon Sep 21 01:38:46 1998 Irfan Pyarali <irfan@cs.wustl.edu> * performance-tests/Cubit/TAO/DII_Cubit/client.cpp (init_naming_service): diff --git a/TAO/tao/Connect.cpp b/TAO/tao/Connect.cpp index a1aa8ffc6af..403256b99f4 100644 --- a/TAO/tao/Connect.cpp +++ b/TAO/tao/Connect.cpp @@ -984,15 +984,14 @@ TAO_Client_Connection_Handler::close (u_long flags) } #define TAO_SVC_TUPLE ACE_Svc_Tuple<TAO_Client_Connection_Handler> -#define TAO_HASH_ADDR ACE_Hash_Addr<ACE_INET_Addr> -#define TAO_RECYCLABLE_ADDR ACE_Recyclable<TAO_HASH_ADDR> -#define TAO_HASH_RECYCLABLE_ADDR ACE_Hash_Recyclable<TAO_HASH_ADDR> +#define CACHED_CONNECT_STRATEGY ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR, TAO_Cached_Connector_Lock> +#define HASH_ADDR CACHED_CONNECT_STRATEGY::HASH_ADDRESS +#define REFCOUNTED_HASH_RECYCLABLE_ADDR CACHED_CONNECT_STRATEGY::REFCOUNTED_HASH_RECYCLABLE_ADDRESS #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Svc_Handler<TAO_SOCK_STREAM, ACE_NULL_SYNCH>; -template class TAO_HASH_ADDR; -template class TAO_RECYCLABLE_ADDR; -template class TAO_HASH_RECYCLABLE_ADDR; +template class HASH_ADDR; +template class REFCOUNTED_HASH_RECYCLABLE_ADDR; template class TAO_SVC_TUPLE; template class ACE_Map_Manager<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>; template class ACE_Map_Iterator_Base<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>; @@ -1001,8 +1000,8 @@ template class ACE_Map_Reverse_Iterator<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX> template class ACE_Map_Entry<int, TAO_SVC_TUPLE*>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Svc_Handler<TAO_SOCK_STREAM, ACE_NULL_SYNCH> -#pragma instantiate TAO_HASH_ADDR -#pragma instantiate TAO_RECYCLABLE_ADDR +#pragma instantiate HASH_ADDR +#pragma instantiate REFCOUNTED_HASH_RECYCLABLE_ADDR #pragma instantiate TAO_HASH_RECYCLABLE_ADDR #pragma instantiate TAO_SVC_TUPLE #pragma instantiate ACE_Map_Manager<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX> diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 21468128b64..c858023ba16 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -865,7 +865,7 @@ operator>>(TAO_InputCDR& cdr, TAO_opaque& x) // **************************************************************** -#define CACHED_CONNECT_STRATEGY ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_MUTEX> +#define CACHED_CONNECT_STRATEGY ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR, TAO_Cached_Connector_Lock> #define HASH_ADDR CACHED_CONNECT_STRATEGY::HASH_ADDRESS #define REFCOUNTED_HASH_RECYCLABLE_ADDR CACHED_CONNECT_STRATEGY::REFCOUNTED_HASH_RECYCLABLE_ADDRESS @@ -901,7 +901,6 @@ template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TA #pragma instantiate CACHED_CONNECT_STRATEGY #pragma instantiate ACE_Guard<TAO_Cached_Connector_Lock> #pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_int> -//#pragma instantiate REFCOUNTED_HASH_RECYCLABLE_ADDR #pragma instantiate ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_Client_Connection_Handler *> #pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_MUTEX> #pragma instantiate ACE_Hash_Map_Iterator_Base<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_MUTEX> |