diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-03-13 10:46:59 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-03-13 10:46:59 +0100 |
| commit | 1ceebf2e295dfd342b8d9e725057350c894e230d (patch) | |
| tree | 8c8bbfa7aac16f7a902de05707a8beb76250de30 | |
| parent | 01cb9ff254befab9c674e957a9e063b3c09bcc26 (diff) | |
| download | ATCD-1ceebf2e295dfd342b8d9e725057350c894e230d.tar.gz | |
Removed deprecated -ORBResources
* TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf:
* TAO/tao/ORB_Core.cpp:
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf | 2 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 9 |
2 files changed, 1 insertions, 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 @@ -803,15 +803,6 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) 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 (ACE_TEXT("-ORBLogFile")))) { // redirect all TAOLIB_DEBUG and TAOLIB_ERROR output to a file |