From 791509c62741a0a1cd7ea2155c3a5f51517594d0 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon, 8 Mar 2021 16:53:16 +0100
Subject: Use std string operations instead of ACE_OS

    * TAO/tao/Acceptor_Registry.cpp:
    * TAO/tao/Adapter_Registry.cpp:
    * TAO/tao/AnyTypeCode/Any.cpp:
    * TAO/tao/AnyTypeCode/Enum_TypeCode.cpp:
    * TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp:
    * TAO/tao/AnyTypeCode/Struct_TypeCode.cpp:
    * TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp:
    * TAO/tao/AnyTypeCode/TypeCode.cpp:
    * TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
    * TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp:
    * TAO/tao/AnyTypeCode/Value_TypeCode.cpp:
    * TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp:
    * TAO/tao/CDR.inl:
    * TAO/tao/CORBALOC_Parser.cpp:
    * TAO/tao/CORBA_String.inl:
    * TAO/tao/DynamicAny/DynCommon.cpp:
    * TAO/tao/DynamicInterface/Request.cpp:
    * TAO/tao/GIOP_Message_Generator_Parser_10.cpp:
    * TAO/tao/HTTP_Handler.cpp:
    * TAO/tao/IIOP_Acceptor.cpp:
    * TAO/tao/IIOP_Connector.cpp:
    * TAO/tao/IIOP_Endpoint.cpp:
    * TAO/tao/IIOP_Profile.cpp:
    * TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp:
    * TAO/tao/ImR_Client/ImR_Client.cpp:
    * TAO/tao/MCAST_Parser.cpp:
    * TAO/tao/ORB.cpp:
    * TAO/tao/ORB_Core.cpp:
    * TAO/tao/Object_KeyC.cpp:
    * TAO/tao/Object_Ref_Table.cpp:
    * TAO/tao/PI/Interceptor_List_T.cpp:
    * TAO/tao/PI/ORBInitInfo.cpp:
    * TAO/tao/PortableServer/BD_String_SArgument_T.cpp:
    * TAO/tao/PortableServer/PortableServer_Functions.cpp:
    * TAO/tao/Strategies/COIOP_Connector.cpp:
    * TAO/tao/Strategies/COIOP_Profile.cpp:
    * TAO/tao/Strategies/DIOP_Acceptor.cpp:
    * TAO/tao/Strategies/DIOP_Connector.cpp:
    * TAO/tao/Strategies/DIOP_Endpoint.cpp:
    * TAO/tao/Strategies/DIOP_Profile.cpp:
    * TAO/tao/Strategies/SCIOP_Acceptor.cpp:
    * TAO/tao/Strategies/SCIOP_Connector.cpp:
    * TAO/tao/Strategies/SCIOP_Endpoint.cpp:
    * TAO/tao/Strategies/SCIOP_Profile.cpp:
    * TAO/tao/Strategies/SHMIOP_Connector.cpp:
    * TAO/tao/Strategies/SHMIOP_Endpoint.cpp:
    * TAO/tao/Strategies/SHMIOP_Profile.cpp:
    * TAO/tao/Strategies/UIOP_Connector.cpp:
    * TAO/tao/Strategies/UIOP_Profile.cpp:
    * TAO/tao/String_Alloc.cpp:
    * TAO/tao/TAO_Server_Request.cpp:
    * TAO/tao/TAO_Server_Request.inl:
    * TAO/tao/Transport_Connector.cpp:
---
 TAO/tao/Object_Ref_Table.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'TAO/tao/Object_Ref_Table.cpp')

diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp
index e5268b7612e..304a47a9dec 100644
--- a/TAO/tao/Object_Ref_Table.cpp
+++ b/TAO/tao/Object_Ref_Table.cpp
@@ -5,6 +5,7 @@
 #include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
+#include <cstring>
 
 #ifndef __ACE_INLINE__
 # include "tao/Object_Ref_Table.inl"
@@ -65,7 +66,7 @@ TAO_Object_Ref_Table::bind_i (const char *id, CORBA::Object_ptr obj)
   // Make sure that the supplied Object reference is valid,
   // i.e. not nil.
   if (id == nullptr
-      || ACE_OS::strlen (id) == 0
+      || std::strlen (id) == 0
       || ::CORBA::is_nil (obj))
     {
       errno = EINVAL;
-- 
cgit v1.2.1