diff options
Diffstat (limited to 'TAO/tao/AnyTypeCode')
-rw-r--r-- | TAO/tao/AnyTypeCode/Any.cpp | 3 | ||||
-rw-r--r-- | TAO/tao/AnyTypeCode/Enum_TypeCode.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/AnyTypeCode/Struct_TypeCode.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/AnyTypeCode/TypeCode.cpp | 11 | ||||
-rw-r--r-- | TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp | 4 | ||||
-rw-r--r-- | TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/AnyTypeCode/Value_TypeCode.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp | 2 |
10 files changed, 17 insertions, 15 deletions
diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp index da0c5d2c443..49d5bb77d6f 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -14,6 +14,7 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_wchar.h" #include "ace/OS_Memory.h" +#include <cstring> #if !defined (__ACE_INLINE__) # include "tao/AnyTypeCode/Any.inl" @@ -325,7 +326,7 @@ CORBA::Any::operator<<= (CORBA::Any::from_wchar wc) void CORBA::Any::operator<<= (CORBA::Any::from_string s) { - if (s.bound_ > 0 && s.val_ != 0 && ACE_OS::strlen (s.val_) > s.bound_) + if (s.bound_ > 0 && s.val_ != 0 && std::strlen (s.val_) > s.bound_) { return; } diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp index 842d244a2b2..9748e6b7c46 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp @@ -98,7 +98,7 @@ TAO::TypeCode::Enum<StringType, Traits<StringType>::get_string (lhs_enumerator); char const * const rhs_name = tc->member_name (i); - if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) + if (std::strcmp (lhs_name, rhs_name) != 0) return false; } diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp index 81af701debf..60d7e465f3b 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp @@ -94,7 +94,7 @@ TAO::TypeCode::Enum<char const *, Traits<char const *>::get_string (lhs_enumerator); char const * const rhs_name = tc->member_name (i); - if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) + if (std::strcmp (lhs_name, rhs_name) != 0) return false; } diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp index a258a8c5229..882ddd9bfef 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp @@ -147,7 +147,7 @@ TAO::TypeCode::Struct<StringType, Traits<StringType>::get_string (lhs_field.name); char const * const rhs_name = tc->member_name (i); - if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) + if (std::strcmp (lhs_name, rhs_name) != 0) return false; CORBA::TypeCode_ptr const lhs_tc = diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp index fb6853c958e..99455427d9e 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp @@ -123,7 +123,7 @@ TAO::TypeCode::Struct<char const *, Traits<char const *>::get_string (lhs_field.name); char const * const rhs_name = tc->member_name (i); - if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) + if (std::strcmp (lhs_name, rhs_name) != 0) return false; CORBA::TypeCode_ptr const lhs_tc = diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp index 53108bd3b91..15de05e890b 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode.cpp @@ -10,6 +10,7 @@ #include "tao/SystemException.h" #include "ace/OS_NS_string.h" +#include <cstring> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -46,14 +47,14 @@ CORBA::TypeCode::equal (TypeCode_ptr tc) const char const * const this_id = this->id (); - if (ACE_OS::strcmp (this_id, tc_id) != 0) + if (std::strcmp (this_id, tc_id) != 0) return false; char const * const tc_name = tc->name (); char const * const this_name = this->name (); - if (ACE_OS::strcmp (this_name, tc_name) != 0) + if (std::strcmp (this_name, tc_name) != 0) return false; } catch (const ::CORBA::TypeCode::BadKind&) @@ -96,10 +97,10 @@ CORBA::TypeCode::equivalent (TypeCode_ptr tc) const char const * const this_id = unaliased_this->id (); char const * const tc_id = unaliased_tc->id (); - if (ACE_OS::strlen (this_id) != 0 - && ACE_OS::strlen (tc_id) != 0) + if (std::strlen (this_id) != 0 + && std::strlen (tc_id) != 0) { - return ACE_OS::strcmp (this_id, tc_id) == 0; + return std::strcmp (this_id, tc_id) == 0; } } catch (const ::CORBA::TypeCode::BadKind&) diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp index e80e1c653a4..1926cbafca8 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp @@ -160,7 +160,7 @@ namespace { TAO::TypeCodeFactory::TC_Info & info = infos[i]; - if (ACE_OS::strcmp (info.id, id) == 0) + if (std::strcmp (info.id, id) == 0) { // We have a matching id, so store the TypeCode in the out // array and then compare the others. @@ -396,7 +396,7 @@ TAO::TypeCodeFactory::tc_objref_factory (CORBA::TCKind kind, break; } - if (ACE_OS::strcmp (id.in (), // len >= 0!!! + if (std::strcmp (id.in (), // len >= 0!!! tc_constant_id) == 0) { if (!cdr.skip_string ()) // No need to demarshal the name. diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp index f383c79659d..9e5215d71fd 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp @@ -24,7 +24,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index, char const * const lhs_name = this->name (); char const * const rhs_name = tc->member_name (index); - if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) + if (std::strcmp (lhs_name, rhs_name) != 0) return false; // Check case TypeCodes. diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp index 79e5fb02c9d..47cb3168c52 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp @@ -188,7 +188,7 @@ TAO::TypeCode::Value<StringType, Traits<StringType>::get_string (lhs_field.name); char const * const rhs_name = tc->member_name (i); - if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) + if (std::strcmp (lhs_name, rhs_name) != 0) return false; CORBA::TypeCode_ptr const lhs_tc = diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp index 293192bb0b5..6a73ea9519f 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp @@ -146,7 +146,7 @@ TAO::TypeCode::Value<char const *, Traits<char const *>::get_string (lhs_field.name);; char const * const rhs_name = tc->member_name (i); - if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) + if (std::strcmp (lhs_name, rhs_name) != 0) return false; CORBA::TypeCode_ptr const lhs_tc = |