summaryrefslogtreecommitdiff
path: root/TAO/tao/ORB_Core.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2021-03-08 16:53:16 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2021-03-08 16:53:16 +0100
commit791509c62741a0a1cd7ea2155c3a5f51517594d0 (patch)
tree1a29e3d0cd24060f79e9b76af02976767f2d200e /TAO/tao/ORB_Core.cpp
parent74d46d603c2f34cbd675287f40ceaff6a21007fa (diff)
downloadATCD-791509c62741a0a1cd7ea2155c3a5f51517594d0.tar.gz
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:
Diffstat (limited to 'TAO/tao/ORB_Core.cpp')
-rw-r--r--TAO/tao/ORB_Core.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index cb2d45bff86..4073819bfd0 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -65,6 +65,7 @@
#include "ace/OS_NS_strings.h"
#include "ace/OS_NS_string.h"
#include "ace/Message_Block.h"
+#include <cstring>
#if TAO_HAS_INTERCEPTORS == 1
# include "tao/ClientRequestInterceptor_Adapter.h"
@@ -73,7 +74,6 @@
# include "tao/ServerRequestInterceptor_Adapter_Factory.h"
#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
#if !defined (__ACE_INLINE__)
# include "tao/ORB_Core.inl"
#endif /* ! __ACE_INLINE__ */
@@ -2870,7 +2870,7 @@ TAO_ORB_Core::resolve_rir (const char *name)
this->orb_params ()->default_init_ref ();
// Check if a DefaultInitRef was specified.
- if (ACE_OS::strlen (default_init_ref.in ()) != 0)
+ if (std::strlen (default_init_ref.in ()) != 0)
{
static const char corbaloc_prefix[] = "corbaloc:";
static const char mcast_prefix[] = "mcast:";