diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2003-02-06 16:49:37 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2003-02-06 16:49:37 +0000 |
| commit | 54b73ff0c966d79e05ca3a2dbbe67c51ff30ca05 (patch) | |
| tree | 6d0facf3e3c262d0c090c71cc2807092b4d58338 | |
| parent | 84f0721f510fa990d1ccff04f350b5e849a762c6 (diff) | |
| download | ATCD-54b73ff0c966d79e05ca3a2dbbe67c51ff30ca05.tar.gz | |
ChangeLogTag:Thu Feb 6 07:13:06 2003 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
| -rw-r--r-- | ace/Refcounted_Auto_Ptr.h | 2 | ||||
| -rw-r--r-- | ace/Refcounted_Auto_Ptr.i | 4 |
4 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index f23b1412f4b..f2c85bfb0fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 6 07:13:06 2003 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/Refcounted_Auto_Ptr.{h,i} (get): Made the get() method const. + Thanks to Jenny Kowald <jkowald@agile.tv> for suggesting this. + Wed Feb 5 20:48:47 2003 Krishnakumar B <kitty@cse.wustl.edu> * include/makeinclude/rules.local.GNU: Added rules to generate diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index f23b1412f4b..f2c85bfb0fb 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Thu Feb 6 07:13:06 2003 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/Refcounted_Auto_Ptr.{h,i} (get): Made the get() method const. + Thanks to Jenny Kowald <jkowald@agile.tv> for suggesting this. + Wed Feb 5 20:48:47 2003 Krishnakumar B <kitty@cse.wustl.edu> * include/makeinclude/rules.local.GNU: Added rules to generate diff --git a/ace/Refcounted_Auto_Ptr.h b/ace/Refcounted_Auto_Ptr.h index b7f9bf470c6..7218fb0fb21 100644 --- a/ace/Refcounted_Auto_Ptr.h +++ b/ace/Refcounted_Auto_Ptr.h @@ -84,7 +84,7 @@ public: void reset (X *p = 0); /// Get the pointer value. - X *get (void); + X *get (void) const; /// Get the reference count value. int count (void) const; diff --git a/ace/Refcounted_Auto_Ptr.i b/ace/Refcounted_Auto_Ptr.i index 6a267821364..6a4b7ccde64 100644 --- a/ace/Refcounted_Auto_Ptr.i +++ b/ace/Refcounted_Auto_Ptr.i @@ -140,9 +140,9 @@ ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::reset (X *p) } template <class X, class ACE_LOCK> inline X * -ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::get (void) +ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::get (void) const { - ACE_GUARD_RETURN (ACE_LOCK, guard, this->lock_, 0); + ACE_GUARD_RETURN (ACE_LOCK, guard, ACE_const_cast (ACE_LOCK &, this->lock_), 0); return this->ptr_.get (); } |