summaryrefslogtreecommitdiff
path: root/TAO/tao/Strategies
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/Strategies')
-rw-r--r--TAO/tao/Strategies/COIOP_Connector.cpp7
-rw-r--r--TAO/tao/Strategies/COIOP_Profile.cpp2
-rw-r--r--TAO/tao/Strategies/DIOP_Acceptor.cpp5
-rw-r--r--TAO/tao/Strategies/DIOP_Connector.cpp7
-rw-r--r--TAO/tao/Strategies/DIOP_Endpoint.cpp3
-rw-r--r--TAO/tao/Strategies/DIOP_Profile.cpp9
-rw-r--r--TAO/tao/Strategies/SCIOP_Acceptor.cpp7
-rw-r--r--TAO/tao/Strategies/SCIOP_Connector.cpp8
-rw-r--r--TAO/tao/Strategies/SCIOP_Endpoint.cpp3
-rw-r--r--TAO/tao/Strategies/SCIOP_Profile.cpp4
-rw-r--r--TAO/tao/Strategies/SHMIOP_Connector.cpp7
-rw-r--r--TAO/tao/Strategies/SHMIOP_Endpoint.cpp3
-rw-r--r--TAO/tao/Strategies/SHMIOP_Profile.cpp5
-rw-r--r--TAO/tao/Strategies/UIOP_Connector.cpp9
-rw-r--r--TAO/tao/Strategies/UIOP_Profile.cpp11
15 files changed, 51 insertions, 39 deletions
diff --git a/TAO/tao/Strategies/COIOP_Connector.cpp b/TAO/tao/Strategies/COIOP_Connector.cpp
index 5846b47c44e..ce03957681a 100644
--- a/TAO/tao/Strategies/COIOP_Connector.cpp
+++ b/TAO/tao/Strategies/COIOP_Connector.cpp
@@ -10,6 +10,7 @@
#include "ace/OS_NS_strings.h"
#include "ace/OS_NS_string.h"
#include "tao/Strategies/COIOP_Profile.h"
+#include <cstring>
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -108,10 +109,10 @@ TAO_COIOP_Connector::check_prefix (const char *endpoint)
const char *protocol[] = { "COIOP", "COIOPloc" };
- size_t const slot = ACE_OS::strchr (endpoint, ':') - endpoint;
+ size_t const slot = std::strchr (endpoint, ':') - endpoint;
- size_t const len0 = ACE_OS::strlen (protocol[0]);
- size_t const len1 = ACE_OS::strlen (protocol[1]);
+ size_t const len0 = std::strlen (protocol[0]);
+ size_t const len1 = std::strlen (protocol[1]);
// 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.
diff --git a/TAO/tao/Strategies/COIOP_Profile.cpp b/TAO/tao/Strategies/COIOP_Profile.cpp
index 0e1db4b6eea..9802c361d07 100644
--- a/TAO/tao/Strategies/COIOP_Profile.cpp
+++ b/TAO/tao/Strategies/COIOP_Profile.cpp
@@ -98,7 +98,7 @@ TAO_COIOP_Profile::parse_string_i (const char *ior)
// Pull off the "hostname:port/" part of the objref
// Copy the string because we are going to modify it...
const char *okd =
- ACE_OS::strchr (ior, this->object_key_delimiter_);
+ std::strchr (ior, this->object_key_delimiter_);
if (okd == 0 || okd == ior)
{
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index 2a25ad79c67..39574a53fbe 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -19,6 +19,7 @@
#endif /* __ACE_INLINE__ */
#include "ace/os_include/os_netdb.h"
+#include <cstring>
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -546,7 +547,7 @@ TAO_DIOP_Acceptor::parse_address (const char *address,
specified_hostname.clear();
}
- const char *port_separator_loc = ACE_OS::strchr (address, ':');
+ const char *port_separator_loc = std::strchr (address, ':');
char tmp_host[MAXHOSTNAMELEN + 1];
tmp_host[0] = '\0';
bool host_defaulted = port_separator_loc == address;
@@ -563,7 +564,7 @@ TAO_DIOP_Acceptor::parse_address (const char *address,
{
// In this case we have to find the end of the numeric address and
// start looking for the port separator from there.
- char const * const cp_pos = ACE_OS::strchr (address, ']');
+ char const * const cp_pos = std::strchr (address, ']');
if (cp_pos == 0)
{
// No valid IPv6 address specified.
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index 361ba6ed9b7..236bb65d1d2 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -16,6 +16,7 @@
#include "ace/os_include/os_netdb.h"
#include "tao/Strategies/DIOP_Profile.h"
+#include <cstring>
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -254,10 +255,10 @@ TAO_DIOP_Connector::check_prefix (const char *endpoint)
const char *protocol[] = { "diop", "dioploc" };
- size_t const slot = ACE_OS::strchr (endpoint, ':') - endpoint;
+ size_t const slot = std::strchr (endpoint, ':') - endpoint;
- size_t const len0 = ACE_OS::strlen (protocol[0]);
- size_t const len1 = ACE_OS::strlen (protocol[1]);
+ size_t const len0 = std::strlen (protocol[0]);
+ size_t const len1 = std::strlen (protocol[1]);
// 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.
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp
index e616cb66c9e..d21c854a17b 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp
@@ -15,6 +15,7 @@
#endif /* __ACE_INLINE__ */
#include "ace/os_include/os_netdb.h"
+#include <cstring>
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -168,7 +169,7 @@ TAO_DIOP_Endpoint::host (const char *h)
{
this->host_ = h;
#if defined (ACE_HAS_IPV6)
- if (ACE_OS::strchr (h, ':') != 0)
+ if (std::strchr (h, ':') != 0)
this->is_ipv6_decimal_ = true;
#endif /* ACE_HAS_IPV6 */
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index 463806b64b3..d8566303445 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -13,6 +13,7 @@
#include "ace/OS_NS_string.h"
#include "ace/os_include/os_netdb.h"
#include "ace/Truncate.h"
+#include <cstring>
static const char the_prefix[] = "diop";
@@ -117,7 +118,7 @@ TAO_DIOP_Profile::parse_string_i (const char *ior)
{
// Pull off the "hostname:port/" part of the objref
// Copy the string because we are going to modify it...
- const char *okd = ACE_OS::strchr (ior, this->object_key_delimiter_);
+ const char *okd = std::strchr (ior, this->object_key_delimiter_);
if (okd == 0 || okd == ior)
{
@@ -132,7 +133,7 @@ TAO_DIOP_Profile::parse_string_i (const char *ior)
// Length of host string.
CORBA::ULong length_host = 0;
- const char *cp_pos = ACE_OS::strchr (ior, ':'); // Look for a port
+ const char *cp_pos = std::strchr (ior, ':'); // Look for a port
#if defined (ACE_HAS_IPV6)
// IPv6 numeric address in host string?
bool ipv6_in_host = false;
@@ -145,7 +146,7 @@ TAO_DIOP_Profile::parse_string_i (const char *ior)
{
// In this case we have to find the end of the numeric address and
// start looking for the port separator from there.
- const char *cp_pos_a = ACE_OS::strchr (ior, ']');
+ const char *cp_pos_a = std::strchr (ior, ']');
if (cp_pos_a == 0)
{
// No valid IPv6 address specified.
@@ -469,7 +470,7 @@ TAO_DIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
const char* host;
const char* pos;
if (this->endpoint_.is_ipv6_decimal_ &&
- (pos = ACE_OS::strchr (host = this->endpoint_.host (), '%')) != 0)
+ (pos = std::strchr (host = this->endpoint_.host (), '%')) != 0)
{
ACE_CString tmp;
size_t len = pos - host;
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
index ad4ae5e451a..b33826598fb 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
@@ -10,6 +10,7 @@
#include "tao/Transport.h"
#include "tao/CDR.h"
#include "ace/os_include/os_netdb.h"
+#include <cstring>
#if !defined(__ACE_INLINE__)
#include "tao/Strategies/SCIOP_Acceptor.inl"
@@ -237,7 +238,7 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core,
ACE_Multihomed_INET_Addr addr;
- const char *port_separator_loc = ACE_OS::strchr (address, ':');
+ const char *port_separator_loc = std::strchr (address, ':');
ACE_Auto_Basic_Array_Ptr<char> tmp_host_auto;
if (port_separator_loc == address)
@@ -304,7 +305,7 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core,
// in open_i.
// Set the length of the hostname
- hostname_length = ACE_OS::strlen(address);
+ hostname_length = std::strlen(address);
}
ACE_NEW_RETURN(tmp_host, char[hostname_length + 1], -1);
@@ -803,7 +804,7 @@ TAO_SCIOP_Acceptor::parse_multiple_hostnames (const char *hostnames,
{
// Make a copy of hostnames string
- int const hostnames_string_length = ACE_OS::strlen(hostnames) + 1;
+ int const hostnames_string_length = std::strlen(hostnames) + 1;
char* hostnames_copy = 0;
ACE_NEW_RETURN (hostnames_copy,
char[hostnames_string_length],
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index c7b9e328fde..b11b0340d5a 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -18,6 +18,7 @@
#include "ace/OS_NS_strings.h"
#include "ace/Strategies_T.h"
+#include <cstring>
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -360,10 +361,9 @@ TAO_SCIOP_Connector::check_prefix (const char *endpoint)
const char *protocol[] = { "sciop", "scioploc" };
- size_t slot = ACE_OS::strchr (endpoint, ':') - endpoint;
-
- size_t len0 = ACE_OS::strlen (protocol[0]);
- size_t len1 = ACE_OS::strlen (protocol[1]);
+ size_t const slot = std::strchr (endpoint, ':') - endpoint;
+ size_t const len0 = std::strlen (protocol[0]);
+ size_t const len1 = std::strlen (protocol[1]);
// 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.
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
index c2c0d330ff7..213d7e52f01 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
@@ -13,6 +13,7 @@
#include "ace/Synch.h"
#include "ace/OS_NS_stdio.h"
#include "tao/ORB_Core.h"
+#include <cstring>
#if !defined (__ACE_INLINE__)
# include "tao/Strategies/SCIOP_Endpoint.inl"
@@ -131,7 +132,7 @@ TAO_SCIOP_Endpoint::addr_to_string (char *buffer, size_t length)
size_t actual_len =
ACE_OS::strlen (this->host_.in ()) // chars in host name
+ sizeof (':') // delimiter
- + ACE_OS::strlen ("65536") // max port
+ + std::strlen ("65536") // max port
+ sizeof ('\0');
if (length < actual_len)
diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp
index a5088c77aa5..114bd24aa21 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SCIOP_Profile.cpp
@@ -137,7 +137,7 @@ TAO_SCIOP_Profile::parse_string_i (const char *ior)
// Pull off the "hostname:port/" part of the objref
// Copy the string because we are going to modify it...
- const char *okd = ACE_OS::strchr (ior, this->object_key_delimiter_);
+ const char *okd = std::strchr (ior, this->object_key_delimiter_);
if (okd == 0 || okd == ior)
{
@@ -152,7 +152,7 @@ TAO_SCIOP_Profile::parse_string_i (const char *ior)
// Length of host string.
CORBA::ULong length_host = 0;
- const char *cp_pos = ACE_OS::strchr (ior, ':'); // Look for a port
+ const char *cp_pos = std::strchr (ior, ':'); // Look for a port
if (cp_pos == ior)
{
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index 3f0532eb050..37197284327 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -13,6 +13,7 @@
#include "tao/Thread_Lane_Resources.h"
#include "tao/Blocked_Connect_Strategy.h"
#include "ace/OS_NS_strings.h"
+#include <cstring>
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -303,10 +304,10 @@ TAO_SHMIOP_Connector::check_prefix (const char *endpoint)
const char *protocol[] = { "shmiop", "shmioploc" };
- size_t slot = ACE_OS::strchr (endpoint, ':') - endpoint;
+ size_t const slot = std::strchr (endpoint, ':') - endpoint;
- size_t len0 = ACE_OS::strlen (protocol[0]);
- size_t len1 = ACE_OS::strlen (protocol[1]);
+ size_t const len0 = std::strlen (protocol[0]);
+ size_t const len1 = std::strlen (protocol[1]);
// 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.
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
index 911c1b14ad4..354172a95ca 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
@@ -13,6 +13,7 @@
#endif /* __ACE_INLINE__ */
#include "ace/os_include/os_netdb.h"
+#include <cstring>
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -129,7 +130,7 @@ TAO_SHMIOP_Endpoint::addr_to_string (char *buffer, size_t length)
size_t actual_len =
ACE_OS::strlen (this->host_.in ()) // chars in host name
+ sizeof (':') // delimiter
- + ACE_OS::strlen ("65536") // max port
+ + std::strlen ("65536") // max port
+ sizeof ('\0');
if (length < actual_len)
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 7b43eb77f60..eb01ce6655b 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -13,6 +13,7 @@
#include "ace/OS_NS_string.h"
#include "ace/os_include/os_netdb.h"
#include "ace/Truncate.h"
+#include <cstring>
static const char prefix_[] = "shmiop";
@@ -130,7 +131,7 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string)
CORBA::String_var copy (string);
char *start = copy.inout ();
- char *cp = ACE_OS::strchr (start, ':'); // Look for a port
+ char *cp = std::strchr (start, ':'); // Look for a port
if (cp == 0)
{
@@ -142,7 +143,7 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string)
CORBA::COMPLETED_NO);
}
- char *okd = ACE_OS::strchr (start, this->object_key_delimiter_);
+ char *okd = std::strchr (start, this->object_key_delimiter_);
if (okd == 0)
{
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index c4abd8dd420..2bbc354a4ff 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -15,6 +15,7 @@
#include "ace/OS_NS_strings.h"
#include "ace/OS_NS_string.h"
+#include <cstring>
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -76,7 +77,7 @@ TAO_UIOP_Connector::corbaloc_scan (const char *str, size_t &len)
if (this->check_prefix (str) != 0)
return 0;
- const char *separator = ACE_OS::strchr (str,'|');
+ const char *separator = std::strchr (str,'|');
if (separator == 0)
{
if (TAO_debug_level)
@@ -329,10 +330,10 @@ TAO_UIOP_Connector::check_prefix (const char *endpoint)
static const char *protocol[] = { "uiop", "uioploc" };
- const size_t slot = ACE_OS::strchr (endpoint, ':') - endpoint;
+ size_t const slot = std::strchr (endpoint, ':') - endpoint;
- const size_t len0 = ACE_OS::strlen (protocol[0]);
- const size_t len1 = ACE_OS::strlen (protocol[1]);
+ size_t const len0 = std::strlen (protocol[0]);
+ size_t const len1 = std::strlen (protocol[1]);
// 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.
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index f4fa10f2067..3179089b4ec 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -13,6 +13,7 @@
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_ctype.h"
+#include <cstring>
static const char prefix_[] = "uiop";
@@ -21,7 +22,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
const char TAO_UIOP_Profile::object_key_delimiter_ = '|';
char
-TAO_UIOP_Profile::object_key_delimiter (void) const
+TAO_UIOP_Profile::object_key_delimiter () const
{
return TAO_UIOP_Profile::object_key_delimiter_;
}
@@ -79,13 +80,13 @@ TAO_UIOP_Profile::~TAO_UIOP_Profile (void)
}
TAO_Endpoint*
-TAO_UIOP_Profile::endpoint (void)
+TAO_UIOP_Profile::endpoint ()
{
return &this->endpoint_;
}
CORBA::ULong
-TAO_UIOP_Profile::endpoint_count (void) const
+TAO_UIOP_Profile::endpoint_count () const
{
return this->count_;
}
@@ -135,7 +136,7 @@ TAO_UIOP_Profile::parse_string_i (const char *string)
CORBA::String_var copy (string);
char *start = copy.inout ();
- char *cp = ACE_OS::strchr (start, this->object_key_delimiter_);
+ char *cp = std::strchr (start, this->object_key_delimiter_);
if (cp == 0)
{
@@ -237,7 +238,7 @@ TAO_UIOP_Profile::add_endpoint (TAO_UIOP_Endpoint *endp)
char *
-TAO_UIOP_Profile::to_string (void) const
+TAO_UIOP_Profile::to_string () const
{
CORBA::String_var key;
TAO::ObjectKey::encode_sequence_to_string (key.inout(),
View Lorry Controller Status