diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp index 8542907269b..5f9b7d26c5c 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/HTIOP/HTIOP_Factory.h" -#include "orbsvcs/HTIOP/HTIOP_Acceptor.h" -#include "orbsvcs/HTIOP/HTIOP_Connector.h" -#include "orbsvcs/HTIOP/HTIOP_Profile.h" +#include "HTIOP_Factory.h" +#include "HTIOP_Acceptor.h" +#include "HTIOP_Connector.h" +#include "HTIOP_Profile.h" #include "ace/HTBP/HTBP_Environment.h" #include "tao/IOPC.h" @@ -12,9 +12,7 @@ ACE_RCSID (HTIOP, TAOHTIOP_Factory, "$Id$") -static const char the_prefix[] = "htiop"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL + static const char prefix_[] = "htiop"; TAO::HTIOP::Protocol_Factory::Protocol_Factory (void) : TAO_Protocol_Factory (OCI_TAG_HTIOP_PROFILE), @@ -34,13 +32,13 @@ int TAO::HTIOP::Protocol_Factory::match_prefix (const ACE_CString &prefix) { // Check for the proper prefix for this protocol. - return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix) == 0); + return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0); } const char * TAO::HTIOP::Protocol_Factory::prefix (void) const { - return ::the_prefix; + return ::prefix_; } char @@ -80,7 +78,7 @@ TAO::HTIOP::Protocol_Factory::init (int argc, else if (ACE_OS::strcasecmp(argv[i], ACE_TEXT("-inside")) == 0) { if (++i < argc) - this->inside_ = ::atoi (ACE_TEXT_ALWAYS_CHAR(argv[i])); + this->inside_ = ::atoi (ACE_TEXT_TO_CHAR_IN(argv[i])); } } @@ -125,8 +123,6 @@ TAO::HTIOP::Protocol_Factory::requires_explicit_endpoint (void) const } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_HTIOP_Protocol_Factory, ACE_TEXT ("HTIOP_Factory"), ACE_SVC_OBJ_T, |