diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h index 169e12b7bf2..ad694e1ee78 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,11 +33,10 @@ #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Acceptor; class TAO_Connector; + namespace TAO { namespace SSLIOP @@ -64,7 +63,7 @@ namespace TAO // = Service Configurator hooks. /// Dynamic linking hook - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); /// Verify prefix is a match virtual int match_prefix (const ACE_CString & prefix); @@ -121,7 +120,7 @@ namespace TAO * mechanism list of the @c CSIIOP::CompoundSecMechList IOR tagged * component. */ - // CSIIOP::TLS_SEC_TRANS * csiv2_component_; + CSIIOP::TLS_SEC_TRANS * csiv2_component_; }; } // End SSLIOP namespace. @@ -130,8 +129,6 @@ namespace TAO // Work around preprocessor tokenization. typedef TAO::SSLIOP::Protocol_Factory TAO_SSLIOP_Protocol_Factory; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_SSLIOP, TAO_SSLIOP_Protocol_Factory) ACE_STATIC_SVC_REQUIRE (TAO_SSLIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_SSLIOP, TAO_SSLIOP_Protocol_Factory) |