diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-03-13 18:44:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-13 18:44:05 +0100 |
| commit | 09e9d76103a637f8ce9ee49b24292317e33e2d77 (patch) | |
| tree | 63b6dfd3de91f6f1d5dcbf934f668901d8235ba8 | |
| parent | 1de7aa9a7e1d85c3de36248ee41a89a475e5811b (diff) | |
| parent | 71bf5816be5e2a83653887648f9cff03eef0655d (diff) | |
| download | ATCD-09e9d76103a637f8ce9ee49b24292317e33e2d77.tar.gz | |
Merge pull request #2062 from jwillemsen/jwi-orbresources
Removed deprecated -ORBResources
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf | 2 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 9 | ||||
| -rw-r--r-- | TAO/tao/operation_details.h | 2 |
3 files changed, 2 insertions, 11 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 diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h index 53d4e7bf6e8..a7f15528ab7 100644 --- a/TAO/tao/operation_details.h +++ b/TAO/tao/operation_details.h @@ -148,7 +148,7 @@ public: /// Accessors for the argument list TAO::Argument ** args () const; - CORBA::ULong args_num () const ; + CORBA::ULong args_num () const; /// Exception count CORBA::ULong ex_count () const; |