diff options
Diffstat (limited to 'TAO/tao/Strategies/DIOP_Profile.cpp')
-rw-r--r-- | TAO/tao/Strategies/DIOP_Profile.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp index 19c9432b3a0..af1c9aabad4 100644 --- a/TAO/tao/Strategies/DIOP_Profile.cpp +++ b/TAO/tao/Strategies/DIOP_Profile.cpp @@ -1,6 +1,7 @@ +// This may look like C, but it's really -*- C++ -*- +// // $Id$ - -#include "tao/Strategies/DIOP_Profile.h" +#include "DIOP_Profile.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) @@ -19,9 +20,7 @@ ACE_RCSID (Strategies, DIOP_Profile, "$Id$") -static const char the_prefix[] = "diop"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +static const char prefix_[] = "diop"; const char TAO_DIOP_Profile::object_key_delimiter_ = '/'; @@ -297,7 +296,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) size_t buflen = (8 /* "corbaloc" */ + 1 /* colon separator */ + - ACE_OS::strlen (::the_prefix) + + ACE_OS::strlen (::prefix_) + 1 /* colon separator */ + 1 /* major version */ + 1 /* decimal point */ + @@ -315,7 +314,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_OS::sprintf (buf, "corbaloc:%s:%c.%c@%s:%d%c%s", - ::the_prefix, + ::prefix_, digits [this->version_.major], digits [this->version_.minor], this->endpoint_.host (), @@ -329,7 +328,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const char * TAO_DIOP_Profile::prefix (void) { - return ::the_prefix; + return ::prefix_; } void @@ -473,6 +472,4 @@ TAO_DIOP_Profile::decode_endpoints (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ |