diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-11-15 13:04:05 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-11-15 13:04:05 +0000 |
| commit | 18a7566c256545d83bbff1be81b1532d356d69c0 (patch) | |
| tree | 7a0c4589a258df44ef5ecc142bbd2991f60b0815 /TAO/orbsvcs/performance-tests | |
| parent | 7d06c5adc54ce9db1ab83ba690d58eb626df9040 (diff) | |
| download | ATCD-18a7566c256545d83bbff1be81b1532d356d69c0.tar.gz | |
Mon Nov 15 12:59:06 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
* orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp:
* orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp:
* orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp:
* orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp:
* orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp:
* orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp:
* orbsvcs/performance-tests/RTEvent/lib/Control.cpp:
* orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp:
* orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp:
* orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp:
* orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
* orbsvcs/tests/FtRtEvent/consumer.cpp:
* orbsvcs/tests/FtRtEvent/supplier.cpp:
* tao/IORManipulation/IORManipulation.cpp:
* tao/Load_Protocol_Factory_T.h:
* tao/default_resource.cpp:
Use ACE_auto_ptr_reset
Diffstat (limited to 'TAO/orbsvcs/performance-tests')
4 files changed, 11 insertions, 22 deletions
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp index 42e5a867ce4..33da2d8332e 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp @@ -114,11 +114,9 @@ Control::join (Federated_Test::Peer_ptr peer) this->peers_[j]->setup_loopback (experiment_id, base_event_type); - ACE_AUTO_PTR_RESET (disconnects[lcount], + ACE_auto_ptr_reset (disconnects[lcount], new Loopback_Disconnect ( - loopbacks[lcount].in ()), - Loopback_Disconnect - ); + loopbacks[lcount].in ())); lcount++; loopbacks[lcount] = @@ -127,9 +125,7 @@ Control::join (Federated_Test::Peer_ptr peer) ACE_AUTO_PTR_RESET (disconnects[lcount], new Loopback_Disconnect ( - loopbacks[lcount].in ()), - Loopback_Disconnect - ); + loopbacks[lcount].in ())); lcount++; } } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp index 4ca093c4c0d..187c085031a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp @@ -77,11 +77,10 @@ Low_Priority_Setup (int consumer_count, this->clients_[j].supplier (), barrier); this->tasks_[j].thr_mgr (&this->thr_mgr_); - ACE_AUTO_PTR_RESET (this->stoppers_[j], + ACE_auto_ptr_reset (this->stoppers_[j], new Send_Task_Stopper (thread_priority, thread_sched_class, - &this->tasks_[j]), - Send_Task_Stopper); + &this->tasks_[j])); } } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp index f95f88653a4..83ebbe83f19 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp @@ -26,19 +26,15 @@ RTClient_Setup::RTClient_Setup (int use_rt_corba, if (use_rt_corba) { - ACE_AUTO_PTR_RESET (this->rtcorba_setup_, + ACE_auto_ptr_reset (this->rtcorba_setup_, new RTCORBA_Setup (orb, rt_class, - nthreads), - RTCORBA_Setup - ); + nthreads)); #if 0 - ACE_AUTO_PTR_RESET (this->priorityband_setup_, + ACE_auto_ptr_reset (this->priorityband_setup_, new PriorityBand_Setup (orb, - *this->rtcorba_setup_), - PriorityBand_Setup - ); + *this->rtcorba_setup_)); #endif /* 0 */ } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp index df2bef5b36f..c02073eb0b8 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp @@ -28,11 +28,9 @@ RTServer_Setup::RTServer_Setup (int use_rt_corba, if (use_rt_corba) { - ACE_AUTO_PTR_RESET (this->rtpoa_setup_, + ACE_auto_ptr_reset (this->rtpoa_setup_, new RTPOA_Setup (orb, - *this->rtcorba_setup ()), - RTPOA_Setup - ); + *this->rtcorba_setup ())); this->poa_ = this->rtpoa_setup_->poa (); |