diff options
author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-11 01:37:00 +0000 |
---|---|---|
committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-11 01:37:00 +0000 |
commit | d3fb061e619f37449b3ed320dbde5c3b01537cab (patch) | |
tree | 1b86fb2645b11836fc37147958e3d9b218fc0b92 | |
parent | d4390d216b5f21da6a66c1ac97c2cfc6fcaacc7e (diff) | |
download | ATCD-d3fb061e619f37449b3ed320dbde5c3b01537cab.tar.gz |
Changed auto_ptr::reset to release and assign.
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index 1c4976552d6..88b79afce63 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -144,7 +144,11 @@ init (int config_count, ACE_CHECK_RETURN (-1); // Make sure the new config info is cleaned up if we exit abruptly. - new_config_info_ptr.reset (new_config_info); + if (new_config_info != new_config_info_ptr.get ()) + { + new_config_info_ptr.release (); + new_config_info_ptr = new_config_info; + } result = config_info_map_.bind (config_info [config_info_count_].preemption_priority, new_config_info); @@ -1365,7 +1369,11 @@ assign_priorities_i (CORBA::Environment &ACE_TRY_ENV) ACE_CHECK; // Make sure the new config info is cleaned up if we exit abruptly. - new_config_info_ptr.reset (new_config_info); + if (new_config_info != new_config_info_ptr.get ()) + { + new_config_info_ptr.release (); + new_config_info_ptr = new_config_info; + } // Have the strategy fill in the new config info for that // priority level, using the representative scheduling entry. |