summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp')
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index a353451fc9b..370ff9fd142 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -1,7 +1,9 @@
+// This may look like C, but it's really -*- C++ -*-
+//
// $Id$
-#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
-#include "orbsvcs/PortableGroup/UIPMC_Connector.h"
+#include "UIPMC_Profile.h"
+#include "UIPMC_Connector.h"
#include "tao/debug.h"
#include "tao/ORB_Core.h"
@@ -12,11 +14,9 @@
#include "ace/Connector.h"
#include "ace/OS_NS_strings.h"
-ACE_RCSID (PortableGroup,
+ACE_RCSID (tao,
UIPMC_Connector, "$Id$")
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
TAO_UIPMC_Connector::TAO_UIPMC_Connector (CORBA::Boolean)
: TAO_Connector (TAO_TAG_UIPMC_PROFILE)
{
@@ -181,15 +181,15 @@ TAO_UIPMC_Connector::check_prefix (const char *endpoint)
if (!endpoint || !*endpoint)
return -1; // Failure
- static const char protocol[] = "miop";
- static size_t const len = sizeof (protocol) - 1;
+ const char *protocol[] = { "miop" };
- size_t const slot = ACE_OS::strchr (endpoint, ':') - endpoint;
+ size_t slot = ACE_OS::strchr (endpoint, ':') - endpoint;
+ size_t len0 = ACE_OS::strlen (protocol[0]);
// Check for the proper prefix in the IOR. If the proper prefix
// isn't in the IOR then it is not an IOR we can use.
- if (slot == len
- && ACE_OS::strncasecmp (endpoint, protocol, len) == 0)
+ if (slot == len0
+ && ACE_OS::strncasecmp (endpoint, protocol[0], len0) == 0)
return 0;
return -1;
@@ -205,14 +205,14 @@ TAO_UIPMC_Connector::object_key_delimiter (void) const
int
TAO_UIPMC_Connector::cancel_svc_handler (
- TAO_Connection_Handler * /* svc_handler */)
+ TAO_Connection_Handler * svc_handler)
{
+ ACE_UNUSED_ARG(svc_handler);
+
// Noop
return 0;
}
-TAO_END_VERSIONED_NAMESPACE_DECL
-
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
template class ACE_Hash <ACE_INET_Addr>;