diff options
Diffstat (limited to 'TAO/tao/Strategies/DIOP_Factory.cpp')
| -rw-r--r-- | TAO/tao/Strategies/DIOP_Factory.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp index 8c23791d31f..ef5755dde44 100644 --- a/TAO/tao/Strategies/DIOP_Factory.cpp +++ b/TAO/tao/Strategies/DIOP_Factory.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "tao/Strategies/DIOP_Factory.h" +#include "DIOP_Factory.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) -#include "tao/Strategies/DIOP_Acceptor.h" -#include "tao/Strategies/DIOP_Connector.h" +#include "DIOP_Acceptor.h" +#include "DIOP_Connector.h" #include "tao/ORB_Constants.h" @@ -15,9 +15,7 @@ ACE_RCSID (Strategies, DIOP_Factory, "$Id$") -static const char the_prefix[] = "diop"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +static const char prefix_[] = "diop"; TAO_DIOP_Protocol_Factory::TAO_DIOP_Protocol_Factory (void) : TAO_Protocol_Factory (TAO_TAG_DIOP_PROFILE), @@ -34,13 +32,13 @@ int TAO_DIOP_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_DIOP_Protocol_Factory::prefix (void) const { - return ::the_prefix; + return ::prefix_; } char @@ -94,8 +92,6 @@ TAO_DIOP_Protocol_Factory::requires_explicit_endpoint (void) const return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_DIOP_Protocol_Factory, ACE_TEXT ("DIOP_Factory"), ACE_SVC_OBJ_T, |