diff options
author | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-09-11 13:18:48 +0000 |
---|---|---|
committer | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-09-11 13:18:48 +0000 |
commit | 0f292d82a7ab464f3cccaf606655fb5b8efcfcf7 (patch) | |
tree | 9c287eced33c3b717d7e023de8dd45e6ec4f44b5 /ACE/ace/Bound_Ptr.h | |
parent | bfcb4392743149794a72368d873082a4cb7acfce (diff) | |
download | ATCD-0f292d82a7ab464f3cccaf606655fb5b8efcfcf7.tar.gz |
ChangeLogTag: Mon Sep 11 13:03:17 UTC 2006 Boris Kolpackov <boris@codesynthesis.com>
Diffstat (limited to 'ACE/ace/Bound_Ptr.h')
-rw-r--r-- | ACE/ace/Bound_Ptr.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/ACE/ace/Bound_Ptr.h b/ACE/ace/Bound_Ptr.h index 619e0c4eb87..f5eabd68a56 100644 --- a/ACE/ace/Bound_Ptr.h +++ b/ACE/ace/Bound_Ptr.h @@ -7,7 +7,6 @@ * $Id$ * * @author Christopher Kohlhoff <chris@kohlhoff.com> - * @author Boris Kolpackov <boris@codesynthesis.com> */ //============================================================================= @@ -126,19 +125,6 @@ public: /// Constructor binds <this> and <r> to the same object. ACE_Strong_Bound_Ptr (const ACE_Weak_Bound_Ptr<X, ACE_LOCK> &r); - /// Copy constructor binds <this> and <r> to the same object if - /// Y* can be implicitly converted to X*. - template <class Y> - ACE_Strong_Bound_Ptr (const ACE_Strong_Bound_Ptr<Y, ACE_LOCK> &r) - : counter_ (r.counter_), - ptr_ (dynamic_cast<X*>(r.ptr_)) - { - // This ctor is temporarily defined here to increase our chances - // of being accepted by broken compilers. - // - COUNTER::attach_strong (this->counter_); - } - /// Destructor. ~ACE_Strong_Bound_Ptr (void); @@ -148,29 +134,6 @@ public: /// Assignment operator that binds <this> and <r> to the same object. void operator = (const ACE_Weak_Bound_Ptr<X, ACE_LOCK> &r); - /// Assignment operator that binds <this> and <r> to the same object - /// if Y* can be implicitly converted to X*. - template <class Y> - ACE_Weak_Bound_Ptr<X, ACE_LOCK>& - operator= (const ACE_Strong_Bound_Ptr<Y, ACE_LOCK> &r) - { - // This operator is temporarily defined here to increase our chances - // of being accepted by broken compilers. - // - - // This will work if &r == this, by first increasing the ref count - - COUNTER *new_counter = r.counter_; - X* new_ptr = dynamic_cast<X*> (r.ptr_); - COUNTER::attach_strong (new_counter); - if (COUNTER::detach_strong (this->counter_) == 0) - delete this->ptr_; - this->counter_ = new_counter; - this->ptr_ = new_ptr; - - return *this; - } - /// Equality operator that returns @c true if both /// ACE_Strong_Bound_Ptr instances point to the same underlying /// object. |