diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-21 23:33:24 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-21 23:33:24 +0000 |
| commit | ea7a5f4c3fbaa4dd4aeac4eff2e6f5166aa129dd (patch) | |
| tree | f68ff05d2de279df7b357f4da4ecacce2196c879 | |
| parent | 970025839d5548be9ca7f0730e0f66b75ecb7a41 (diff) | |
| download | ATCD-ea7a5f4c3fbaa4dd4aeac4eff2e6f5166aa129dd.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-98b | 4 | ||||
| -rw-r--r-- | TAO/ChangeLog-98c | 5 | ||||
| -rw-r--r-- | TAO/tao/Connect.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/ORB.cpp | 4 | ||||
| -rw-r--r-- | tests/Conn_Test.cpp | 4 |
5 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b index d8e69915936..72d764e9e07 100644 --- a/ChangeLog-98b +++ b/ChangeLog-98b @@ -1,3 +1,7 @@ +Mon Sep 21 18:27:19 1998 Irfan Pyarali <irfan@cs.wustl.edu> + + * tests/Conn_Test.cpp: g++ cannot gork templates typedefs. + Mon Sep 21 15:48:34 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace/Acceptor: It's now possible to select if you want to reuse diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 59d08df41e7..0a037e34c1e 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,5 +1,10 @@ Mon Sep 21 18:20:35 1998 Irfan Pyarali <irfan@cs.wustl.edu> + * tao/ORB.cpp: + * tao/Connect.cpp: + + g++ cannot gork templates typedefs. + * orbsvcs/orbsvcs/Naming/CosNaming_i.cpp (new_context and list): Cannot call _this() directly since the POA has the USER_ID policy. Therefore, added a simple scheme for producing names diff --git a/TAO/tao/Connect.cpp b/TAO/tao/Connect.cpp index 403256b99f4..0c610e6005a 100644 --- a/TAO/tao/Connect.cpp +++ b/TAO/tao/Connect.cpp @@ -985,8 +985,8 @@ TAO_Client_Connection_Handler::close (u_long flags) #define TAO_SVC_TUPLE ACE_Svc_Tuple<TAO_Client_Connection_Handler> #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 +#define HASH_ADDR ACE_Hash_Addr<ACE_INET_Addr> +#define REFCOUNTED_HASH_RECYCLABLE_ADDR ACE_Refcounted_Hash_Recyclable<ACE_Hash_Addr<ACE_INET_Addr> > #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Svc_Handler<TAO_SOCK_STREAM, ACE_NULL_SYNCH>; diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index c858023ba16..81c00769c9c 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -866,8 +866,8 @@ operator>>(TAO_InputCDR& cdr, TAO_opaque& x) // **************************************************************** #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 +#define HASH_ADDR ACE_Hash_Addr<ACE_INET_Addr> +#define REFCOUNTED_HASH_RECYCLABLE_ADDR ACE_Refcounted_Hash_Recyclable<ACE_Hash_Addr<ACE_INET_Addr> > #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp index 78b3fa74e36..8e5000e5037 100644 --- a/tests/Conn_Test.cpp +++ b/tests/Conn_Test.cpp @@ -698,8 +698,8 @@ main (int argc, ASYS_TCHAR *argv[]) } #define CACHED_CONNECT_STRATEGY ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_MUTEX> -#define HASH_ADDR CACHED_CONNECT_STRATEGY::HASH_ADDRESS -#define REFCOUNTED_HASH_RECYCLABLE_ADDR CACHED_CONNECT_STRATEGY::REFCOUNTED_HASH_RECYCLABLE_ADDRESS +#define HASH_ADDR ACE_Hash_Addr<ACE_INET_Addr> +#define REFCOUNTED_HASH_RECYCLABLE_ADDR ACE_Refcounted_Hash_Recyclable<ACE_Hash_Addr<ACE_INET_Addr> > #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class CACHED_CONNECT_STRATEGY; |