diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2000-10-24 23:12:27 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2000-10-24 23:12:27 +0000 |
| commit | 17f0f5b9f9aff4fab36c64bd9ac63cb467333e1a (patch) | |
| tree | 2791aa666321800223cbfc9a1f7cf679151d522f | |
| parent | fff29a53122ca945cda1f6d633020cf3cbd70c23 (diff) | |
| download | ATCD-17f0f5b9f9aff4fab36c64bd9ac63cb467333e1a.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/tao/IIOP_Connect.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Connector.cpp | 31 |
2 files changed, 24 insertions, 11 deletions
diff --git a/TAO/tao/IIOP_Connect.cpp b/TAO/tao/IIOP_Connect.cpp index fbdf56bc1e7..90afd7db453 100644 --- a/TAO/tao/IIOP_Connect.cpp +++ b/TAO/tao/IIOP_Connect.cpp @@ -462,6 +462,10 @@ TAO_IIOP_Client_Connection_Handler::handle_cleanup (void) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index d4a88f859cc..48e26e05b68 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -15,27 +15,32 @@ ACE_RCSID(tao, IIOP_Connector, "$Id$") #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>; +template class ACE_Node<ACE_INET_Addr>; +template class ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>; template class ACE_Unbounded_Stack<ACE_INET_Addr>; template class ACE_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>; -template class ACE_Strategy_Connector<TAO_IIOP_Client_Connection_Handler, ACE_SOCK_Connector>; -template class ACE_Connect_Strategy<TAO_IIOP_Client_Connection_Handler, ACE_SOCK_Connector>; -template class ACE_NOOP_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>; -template class ACE_Connector<TAO_IIOP_Client_Connection_Handler, ACE_SOCK_Connector>; template class ACE_Creation_Strategy<TAO_IIOP_Client_Connection_Handler>; - +template class ACE_Strategy_Connector<TAO_IIOP_Client_Connection_Handler, ACE_SOCK_CONNECTOR>; +template class ACE_Connect_Strategy<TAO_IIOP_Client_Connection_Handler, ACE_SOCK_CONNECTOR>; +template class ACE_NOOP_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>; +template class ACE_Connector<TAO_IIOP_Client_Connection_Handler, ACE_SOCK_CONNECTOR>; +template class ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler>; +template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> +#pragma instantiate ACE_Node<ACE_INET_Addr> +#pragma instantiate ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> #pragma instantiate ACE_Unbounded_Stack<ACE_INET_Addr> #pragma instantiate ACE_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler> -#pragma instantiate ACE_Strategy_Connector<TAO_IIOP_Client_Connection_Handler, ACE_SOCK_Connector> -#pragma instantiate ACE_Concurrency_Strategy<TAO_IIOP_Server_Connection_Handler> -#pragma instantiate ACE_Connect_Strategy<TAO_IIOP_Client_Connection_Handler, ACE_SOCK_Connector> +#pragma instantiate ACE_Strategy_Connector<TAO_IIOP_Client_Connection_Handler, ACE_SOCK_CONNECTOR> +#pragma instantiate ACE_Connect_Strategy<TAO_IIOP_Client_Connection_Handler, ACE_SOCK_CONNECTOR> #pragma instantiate ACE_NOOP_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler> #pragma instantiate ACE_Connector<TAO_IIOP_Client_Connection_Handler, ACE_SOCK_Connector> #pragma instantiate ACE_Creation_Strategy<TAO_IIOP_Client_Connection_Handler> - +#pragma instantiate ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler> +#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -193,6 +198,10 @@ TAO_IIOP_Connector::connect (TAO_Base_Connection_Property *prop, // Add the handler to Cache int retval = this->add_handler (prop, svc_handler); + + if (retval) + { + } } if (result == -1) |