summaryrefslogtreecommitdiff
path: root/TAO/tao/AnyTypeCode
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/AnyTypeCode')
-rw-r--r--TAO/tao/AnyTypeCode/Any.cpp3
-rw-r--r--TAO/tao/AnyTypeCode/Enum_TypeCode.cpp3
-rw-r--r--TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp24
-rw-r--r--TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp6
-rw-r--r--TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp15
-rw-r--r--TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp9
-rw-r--r--TAO/tao/AnyTypeCode/Struct_TypeCode.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp9
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode.cpp11
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp5
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp3
-rw-r--r--TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp6
-rw-r--r--TAO/tao/AnyTypeCode/Value_TypeCode.cpp5
-rw-r--r--TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp9
14 files changed, 47 insertions, 63 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..104275c6bf4 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
@@ -8,6 +8,7 @@
#include "tao/CDR.h"
#include "ace/Dynamic_Service.h"
+#include <cstring>
#ifndef __ACE_INLINE__
# include "tao/AnyTypeCode/Enum_TypeCode.inl"
@@ -98,7 +99,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..394c5dc02f1 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
@@ -7,6 +7,7 @@
#include "tao/SystemException.h"
#include "ace/Dynamic_Service.h"
+#include <cstring>
#ifndef __ACE_INLINE__
# include "tao/AnyTypeCode/Enum_TypeCode_Static.inl"
@@ -73,8 +74,7 @@ CORBA::Boolean
TAO::TypeCode::Enum<char const *,
char const * const *,
TAO::Null_RefCount_Policy>::equal_i (
- CORBA::TypeCode_ptr tc
- ) const
+ CORBA::TypeCode_ptr tc) const
{
// This call shouldn't throw since CORBA::TypeCode::equal() verified
// that the TCKind is the same as our's prior to invoking this
@@ -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;
}
@@ -105,8 +105,7 @@ CORBA::Boolean
TAO::TypeCode::Enum<char const *,
char const * const *,
TAO::Null_RefCount_Policy>::equivalent_i (
- CORBA::TypeCode_ptr tc
- ) const
+ CORBA::TypeCode_ptr tc) const
{
// Perform a structural comparison, excluding the name() and
// member_name() operations.
@@ -123,8 +122,7 @@ TAO::TypeCode::Enum<char const *,
CORBA::TypeCode_ptr
TAO::TypeCode::Enum<char const *,
char const * const *,
- TAO::Null_RefCount_Policy>::get_compact_typecode_i (
- ) const
+ TAO::Null_RefCount_Policy>::get_compact_typecode_i () const
{
ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_);
@@ -160,8 +158,7 @@ TAO::TypeCode::Enum<char const *,
char const *
TAO::TypeCode::Enum<char const *,
char const * const *,
- TAO::Null_RefCount_Policy>::id_i (
- ) const
+ TAO::Null_RefCount_Policy>::id_i () const
{
// Ownership is retained by the TypeCode, as required by the C++
// mapping.
@@ -171,8 +168,7 @@ TAO::TypeCode::Enum<char const *,
char const *
TAO::TypeCode::Enum<char const *,
char const * const *,
- TAO::Null_RefCount_Policy>::name_i (
- ) const
+ TAO::Null_RefCount_Policy>::name_i () const
{
// Ownership is retained by the TypeCode, as required by the C++
// mapping.
@@ -182,8 +178,7 @@ TAO::TypeCode::Enum<char const *,
CORBA::ULong
TAO::TypeCode::Enum<char const *,
char const * const *,
- TAO::Null_RefCount_Policy>::member_count_i (
- ) const
+ TAO::Null_RefCount_Policy>::member_count_i () const
{
return this->nenumerators_;
}
@@ -192,8 +187,7 @@ char const *
TAO::TypeCode::Enum<char const *,
char const * const *,
TAO::Null_RefCount_Policy>::member_name_i (
- CORBA::ULong index
- ) const
+ CORBA::ULong index) const
{
// Ownership is retained by the TypeCode, as required by the C++
// mapping.
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
index 9022c9ce878..c3edfaa1ab3 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
@@ -115,8 +115,7 @@ TAO::TypeCode::Objref<char const *,
}
char const *
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i (
- ) const
+TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i () const
{
// Ownership is retained by the TypeCode, as required by the C++
// mapping.
@@ -124,8 +123,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i (
}
char const *
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i (
- ) const
+TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i () const
{
// Ownership is retained by the TypeCode, as required by the C++
// mapping.
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
index ebba0d9ea31..dd9782fba95 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
@@ -61,8 +61,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
CORBA::Boolean
TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
TAO::Null_RefCount_Policy>::equal_i (
- CORBA::TypeCode_ptr tc
- ) const
+ CORBA::TypeCode_ptr tc) const
{
// The following calls won't throw since CORBA::TypeCode::equal()
// has already established the kind of tc is the same as our kind.
@@ -82,8 +81,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
CORBA::Boolean
TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
TAO::Null_RefCount_Policy>::equivalent_i (
- CORBA::TypeCode_ptr tc
- ) const
+ CORBA::TypeCode_ptr tc) const
{
// The following calls won't throw since CORBA::TypeCode::equal()
// has already established the kind of tc is the same as our kind.
@@ -102,8 +100,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
CORBA::TypeCode_ptr
TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
- TAO::Null_RefCount_Policy>::get_compact_typecode_i (
- ) const
+ TAO::Null_RefCount_Policy>::get_compact_typecode_i () const
{
// Already compact since tk_sequence and tk_array TypeCodes have no
// name or member names, meaning that we can simply call
@@ -122,16 +119,14 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
CORBA::ULong
TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
- TAO::Null_RefCount_Policy>::length_i (
- ) const
+ TAO::Null_RefCount_Policy>::length_i () const
{
return this->length_;
}
CORBA::TypeCode_ptr
TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
- TAO::Null_RefCount_Policy>::content_type_i (
- ) const
+ TAO::Null_RefCount_Policy>::content_type_i () const
{
return
CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
index 83f28c3add9..47d0eaacbd3 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
@@ -46,8 +46,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equal_i (
CORBA::Boolean
TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equivalent_i (
- CORBA::TypeCode_ptr tc
- ) const
+ CORBA::TypeCode_ptr tc) const
{
// Since TCKind comparisons must be performed before equal_i() is
// called, we can also call it to determine equivalence of
@@ -56,8 +55,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equivalent_i (
}
CORBA::TypeCode_ptr
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i (
- ) const
+TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i () const
{
// Already compact since tk_string and tk_wstring TypeCodes have no
// name or member names, meaning that we can simply call
@@ -70,8 +68,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i (
}
CORBA::ULong
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i (
- ) const
+TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i () const
{
return this->length_;
}
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..dc4a18a18b7 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
@@ -13,6 +13,7 @@
#include "ace/Dynamic_Service.h"
#include "ace/Truncate.h"
+#include <cstring>
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -123,7 +124,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 =
@@ -180,8 +181,7 @@ TAO::TypeCode::Struct<char const *,
CORBA::TypeCode_ptr const *,
TAO::TypeCode::Struct_Field<char const *,
CORBA::TypeCode_ptr const *> const *,
- TAO::Null_RefCount_Policy>::get_compact_typecode_i (
- ) const
+ TAO::Null_RefCount_Policy>::get_compact_typecode_i () const
{
ACE_Array_Base<Struct_Field<CORBA::String_var,
CORBA::TypeCode_var> >
@@ -228,8 +228,7 @@ TAO::TypeCode::Struct<char const *,
CORBA::TypeCode_ptr const *,
TAO::TypeCode::Struct_Field<char const *,
CORBA::TypeCode_ptr const *> const *,
- TAO::Null_RefCount_Policy>::id_i (
- ) const
+ TAO::Null_RefCount_Policy>::id_i () const
{
// Ownership is retained by the TypeCode, as required by the C++
// mapping.
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..3b8c0110947 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
@@ -27,6 +27,7 @@
#include "ace/Array_Base.h"
#include "ace/Value_Ptr.h"
+#include <cstring>
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -160,7 +161,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 +397,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..76bd27168bb 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
@@ -3,6 +3,7 @@
#include "tao/AnyTypeCode/TypeCode_Case_Base_T.h"
#include "ace/OS_NS_string.h"
+#include <cstring>
#ifndef __ACE_INLINE__
# include "tao/AnyTypeCode/TypeCode_Case_Base_T.inl"
@@ -24,7 +25,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/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
index c267a8f0dd8..bdbe062ff12 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
@@ -97,8 +97,7 @@ TAO::TypeCode::Union<char const *,
TAO::TypeCode::Case<char const *,
CORBA::TypeCode_ptr const *> const * const *,
TAO::Null_RefCount_Policy>::equal_i (
- CORBA::TypeCode_ptr tc
- ) const
+ CORBA::TypeCode_ptr tc) const
{
// These calls shouldn't throw since CORBA::TypeCode::equal()
// verified that the TCKind is the same as our's prior to invoking
@@ -197,8 +196,7 @@ TAO::TypeCode::Union<char const *,
CORBA::TypeCode_ptr const *,
TAO::TypeCode::Case<char const *,
CORBA::TypeCode_ptr const *> const * const *,
- TAO::Null_RefCount_Policy>::get_compact_typecode_i (
- ) const
+ TAO::Null_RefCount_Policy>::get_compact_typecode_i () const
{
// typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var,
// CORBA::TypeCode_var> > elem_type;
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
index 79e5fb02c9d..32e79789204 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
@@ -145,8 +145,7 @@ TAO::TypeCode::Value<StringType,
TypeCodeType,
FieldArrayType,
RefCountPolicy>::equal_i (
- CORBA::TypeCode_ptr tc
- ) const
+ CORBA::TypeCode_ptr tc) const
{
// None of these calls should throw since CORBA::TypeCode::equal()
// verified that the TCKind is the same as our's prior to invoking
@@ -188,7 +187,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..8745c4ffb63 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
@@ -9,6 +9,7 @@
#include "ace/Dynamic_Service.h"
#include "ace/Truncate.h"
+#include <cstring>
#ifndef __ACE_INLINE__
# include "tao/AnyTypeCode/Value_TypeCode_Static.inl"
@@ -146,7 +147,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 =
@@ -223,8 +224,7 @@ TAO::TypeCode::Value<char const *,
CORBA::TypeCode_ptr const *,
TAO::TypeCode::Value_Field<char const *,
CORBA::TypeCode_ptr const *> const *,
- TAO::Null_RefCount_Policy>::get_compact_typecode_i (
- ) const
+ TAO::Null_RefCount_Policy>::get_compact_typecode_i () const
{
ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> >
tc_fields (this->nfields_);
@@ -364,8 +364,7 @@ TAO::TypeCode::Value<char const *,
CORBA::TypeCode_ptr const *,
TAO::TypeCode::Value_Field<char const *,
CORBA::TypeCode_ptr const *> const *,
- TAO::Null_RefCount_Policy>::concrete_base_type_i (
- ) const
+ TAO::Null_RefCount_Policy>::concrete_base_type_i () const
{
return
CORBA::TypeCode::_duplicate (
View Lorry Controller Status