From 1ceebf2e295dfd342b8d9e725057350c894e230d Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Mar 2023 10:46:59 +0100 Subject: Removed deprecated -ORBResources * TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf: * TAO/tao/ORB_Core.cpp: --- TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf | 2 +- TAO/tao/ORB_Core.cpp | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf b/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf index 99f9241e162..534bdceef22 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf @@ -1,5 +1,5 @@ # -#static Advanced_Resource_Factory "-ORBresources global -ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null" +#static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null" #static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0" #static Client_Strategy_Factory "-ORBClientConnectionHandler ST" diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 7da08d0f8cb..a938793e1ee 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -800,15 +800,6 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) else this->orb_params ()->ami_collication (false); - arg_shifter.consume_arg (); - } - else if (nullptr != (current_arg = arg_shifter.get_the_parameter - (ACE_TEXT("-ORBResources")))) - { - TAOLIB_DEBUG ((LM_WARNING, - ACE_TEXT ("\"-ORBResources\" has been ") - ACE_TEXT ("deprecated.\n"))); - arg_shifter.consume_arg (); } else if (nullptr != (current_arg = arg_shifter.get_the_parameter -- cgit v1.2.1