diff options
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h | 2 |
7 files changed, 18 insertions, 14 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9534787b6a6..f5c6aee0e6c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Thu Sep 9 09:28:14 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h: + All compilers now support template typedefs, no need to use the + macros + Wed Sep 8 14:42:36 UTC 2010 William Otte <wotte@zifnab> * Release: diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h index 242d7c16eea..5fae591d76b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h @@ -29,13 +29,6 @@ #include "ace/Synch.h" #include "ace/Svc_Handler.h" -//#include "HTIOP/HTIOPC.h" - -# if defined (ACE_HAS_TEMPLATE_TYPEDEFS) -# define ACE_HTBP_STREAM ACE::HTBP::Stream -# else /* If TEMPLATES are broken in some form or another */ -# define ACE_HTBP_STREAM ACE::HTBP::Stream, ACE::HTBP::Addr -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -52,7 +45,7 @@ namespace TAO class Connection_Handler; // Service Handler for this transport - typedef ACE_Svc_Handler<ACE_HTBP_STREAM, ACE_NULL_SYNCH> + typedef ACE_Svc_Handler<ACE::HTBP::Stream, ACE_NULL_SYNCH> SVC_HANDLER; /** diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp index 2392892f14b..4221e052c43 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp @@ -8,7 +8,7 @@ TAO::SSLIOP::Accept_Strategy::Accept_Strategy ( TAO_ORB_Core * orb_core, const ACE_Time_Value & timeout) : TAO_Accept_Strategy<TAO::SSLIOP::Connection_Handler, - ACE_SSL_SOCK_ACCEPTOR> (orb_core), + ACE_SSL_SOCK_Acceptor> (orb_core), timeout_ (timeout) { } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h index 46fabac8fb0..8c79d322359 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h @@ -64,7 +64,7 @@ namespace TAO */ class Accept_Strategy : public TAO_Accept_Strategy<TAO::SSLIOP::Connection_Handler, - ACE_SSL_SOCK_ACCEPTOR> + ACE_SSL_SOCK_Acceptor> { public: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h index 0bdde1c0a35..d3e265a55f6 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h @@ -57,7 +57,7 @@ namespace TAO /// Destructor. ~Acceptor (void); - typedef TAO_Strategy_Acceptor<Connection_Handler, ACE_SSL_SOCK_ACCEPTOR> BASE_ACCEPTOR; + typedef TAO_Strategy_Acceptor<Connection_Handler, ACE_SSL_SOCK_Acceptor> BASE_ACCEPTOR; typedef TAO_Creation_Strategy<Connection_Handler> CREATION_STRATEGY; typedef TAO_Concurrency_Strategy<Connection_Handler> CONCURRENCY_STRATEGY; typedef Accept_Strategy ACCEPT_STRATEGY; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h index f560142bf1c..94832510162 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h @@ -124,11 +124,11 @@ namespace TAO CONNECT_CREATION_STRATEGY; typedef ACE_Connect_Strategy<Connection_Handler, - ACE_SSL_SOCK_CONNECTOR> + ACE_SSL_SOCK_Connector> CONNECT_STRATEGY; typedef ACE_Strategy_Connector<Connection_Handler, - ACE_SSL_SOCK_CONNECTOR> + ACE_SSL_SOCK_Connector> BASE_CONNECTOR; private: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h index 6d32bec493e..50f2fc551f1 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h @@ -46,7 +46,7 @@ namespace TAO { namespace SSLIOP { - typedef ACE_Svc_Handler<ACE_SSL_SOCK_STREAM, ACE_NULL_SYNCH> SVC_HANDLER; + typedef ACE_Svc_Handler<ACE_SSL_SOCK_Stream, ACE_NULL_SYNCH> SVC_HANDLER; class Handler_Base; class Connection_Handler; |