diff options
| author | cdgill <cdgill@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-19 23:45:58 +0000 |
|---|---|---|
| committer | cdgill <cdgill@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-19 23:45:58 +0000 |
| commit | 4686beac1824d2f815b8a0c4c6b12b258449acbb (patch) | |
| tree | 0b6a4a9e17dea7fa3a51fd5d5e302d000d9b015b | |
| parent | 833a2f9113415e5188edfdf7a7257c297bddf1ed (diff) | |
| download | ATCD-4686beac1824d2f815b8a0c4c6b12b258449acbb.tar.gz | |
fixed ACE_AUTO_PTR_RESET macro to take type with which auto_ptr is instantiated
| -rw-r--r-- | ChangeLog-99b | 7 | ||||
| -rw-r--r-- | TAO/ChangeLog-99c | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp | 4 | ||||
| -rw-r--r-- | ace/Auto_Ptr.h | 6 |
4 files changed, 18 insertions, 5 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 2b08e0c2aa0..4957bcf5ae2 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,10 @@ +Thu Aug 19 18:45:00 1999 Chris Gill <cdgill@cs.wustl.edu> + + * ace/Auto_Ptr.h: modified ACE_AUTO_PTR_RESET macro, to pass the + type of the pointer. This is needed for the case where + ACE_AUTO_PTR_LACKS_RESET is defined, in order to explicitly + convert the pointer into an auto_ptr for assignment. + Thu Aug 19 17:26:50 1999 John Heitmann <jwh1@cs.wustl.edu> * docs/ACE-SSL.html: Cleaned up the auto generated errors. diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 1d28aa8b828..27524f58eb5 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,9 @@ +Thu Aug 19 18:45:00 1999 Chris Gill <cdgill@cs.wustl.edu> + + * orbsvcs\orbsvcs\Sched\Reconfig_Scheduler_T.cpp: modified uses of + ACE_AUTO_PTR_RESET macro to pass type with which auto_ptr is + instantiated. + Thu Aug 19 18:34:19 1999 Carlos O'Ryan <coryan@cs.wustl.edu> * tao/Reply_Dispatcher.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index ccfbd4efca8..2dbb7a440eb 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -147,7 +147,7 @@ init (int config_count, ACE_CHECK_RETURN (-1); // Make sure the new config info is cleaned up if we exit abruptly. - ACE_AUTO_PTR_RESET (new_config_info_ptr, new_config_info); + ACE_AUTO_PTR_RESET (new_config_info_ptr, new_config_info, RtecScheduler::Config_Info); result = config_info_map_.bind (config_info [config_info_count_].preemption_priority, new_config_info); @@ -1340,7 +1340,7 @@ assign_priorities_i (CORBA::Environment &ACE_TRY_ENV) ACE_CHECK; // Make sure the new config info is cleaned up if we exit abruptly. - ACE_AUTO_PTR_RESET (new_config_info_ptr, new_config_info); + ACE_AUTO_PTR_RESET (new_config_info_ptr, new_config_info, RtecScheduler::Config_Info); // Have the strategy fill in the new config info for that // priority level, using the representative scheduling entry. diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h index ac04ee34a2f..d08058cd29e 100644 --- a/ace/Auto_Ptr.h +++ b/ace/Auto_Ptr.h @@ -128,16 +128,16 @@ public: // easily. Portability to these platforms requires // use of the following ACE_AUTO_PTR_RESET macro. # if defined (ACE_AUTO_PTR_LACKS_RESET) -# define ACE_AUTO_PTR_RESET(X,Y) \ +# define ACE_AUTO_PTR_RESET(X,Y,Z) \ do { \ if (Y != X.get ()) \ { \ X.release (); \ - X = Y; \ + X = auto_ptr<Z> (Y); \ } \ } while (0) # else /* ! ACE_AUTO_PTR_LACKS_RESET */ -# define ACE_AUTO_PTR_RESET(X,Y) \ +# define ACE_AUTO_PTR_RESET(X,Y,Z) \ do { \ X.reset (Y); \ } while (0) |