summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-11 08:27:45 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-11 08:27:45 +0000
commit0009342d192b73ac575f758e4b61ba3ddc39ebea (patch)
tree7ce72fefbd7fbcae40d8b0f0389db750bd50041b
parentb17a73c44ac2bb8c24c45cb4f5d202dcc6b89bda (diff)
downloadATCD-0009342d192b73ac575f758e4b61ba3ddc39ebea.tar.gz
The assignment operator of auto_ptr takes another auto_ptr, not the pointer itself.
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index 88b79afce63..56062c9efdf 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -146,8 +146,8 @@ init (int config_count,
// Make sure the new config info is cleaned up if we exit abruptly.
if (new_config_info != new_config_info_ptr.get ())
{
- new_config_info_ptr.release ();
- new_config_info_ptr = new_config_info;
+ auto_ptr<RtecScheduler::Config_Info> tmp_config_info_ptr(new_config_info);
+ new_config_info_ptr = tmp_config_info_ptr;
}
result = config_info_map_.bind (config_info [config_info_count_].preemption_priority,
@@ -1371,8 +1371,8 @@ assign_priorities_i (CORBA::Environment &ACE_TRY_ENV)
// Make sure the new config info is cleaned up if we exit abruptly.
if (new_config_info != new_config_info_ptr.get ())
{
- new_config_info_ptr.release ();
- new_config_info_ptr = new_config_info;
+ auto_ptr<RtecScheduler::Config_Info> tmp_config_info_ptr(new_config_info);
+ new_config_info_ptr = tmp_config_info_ptr;
}
// Have the strategy fill in the new config info for that