diff options
| author | Steve Huston <shuston@riverace.com> | 2006-09-14 23:02:57 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2006-09-14 23:02:57 +0000 |
| commit | 0e7bc8eeb994d98b24f907afe153d3d79ca6425e (patch) | |
| tree | 73deb246090a2a654f5045683226b4fee33bbe25 | |
| parent | 66f451bb43a1bf9940b99f2116150835cd427e8d (diff) | |
| download | ATCD-0e7bc8eeb994d98b24f907afe153d3d79ca6425e.tar.gz | |
ChangeLogTag:Thu Sep 14 23:01:16 UTC 2006 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/Bound_Ptr.inl | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 959cb0484ed..3854eaeb661 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 14 23:01:16 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Bound_Ptr.inl: Tweak syntax to try and work around apparant + issues with BCB6. + Thu Sep 14 21:48:39 UTC 2006 Steve Huston <shuston@riverace.com> * ace/OS_NS_Thread.inl (thr_getspecific): Removed the ACE_Errno_Guard diff --git a/ACE/ace/Bound_Ptr.inl b/ACE/ace/Bound_Ptr.inl index 7f6797156f9..bcbf6e8890f 100644 --- a/ACE/ace/Bound_Ptr.inl +++ b/ACE/ace/Bound_Ptr.inl @@ -194,7 +194,7 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::operator = (const ACE_Strong_Bound_Ptr<X, ACE // This will work if &r == this, by first increasing the ref count COUNTER *new_counter = rhs.counter_; - X* new_ptr = rhs.ptr_; + X *new_ptr = rhs.ptr_; COUNTER::attach_strong (new_counter); if (COUNTER::detach_strong (this->counter_) == 0) delete this->ptr_; @@ -208,7 +208,7 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::operator = (const ACE_Weak_Bound_Ptr<X, ACE_L // This will work if &r == this, by first increasing the ref count COUNTER *new_counter = rhs.counter_; - X* new_ptr = rhs.ptr_; + X *new_ptr = rhs.ptr_; // When creating a strong pointer from a weak one we can't assume that the // underlying object still exists. Therefore we must check for a return value @@ -292,7 +292,7 @@ template<class X, class ACE_LOCK> inline void ACE_Strong_Bound_Ptr<X, ACE_LOCK>::reset (X *p) { COUNTER *old_counter = this->counter_; - X* old_ptr = this->ptr_; + X *old_ptr = this->ptr_; this->counter_ = COUNTER::create_strong (); this->ptr_ = p; if (COUNTER::detach_strong (old_counter) == 0) @@ -303,7 +303,7 @@ template<class X, class ACE_LOCK> inline void ACE_Strong_Bound_Ptr<X, ACE_LOCK>::reset (auto_ptr<X> p) { COUNTER *old_counter = this->counter_; - X* old_ptr = this->ptr_; + X *old_ptr = this->ptr_; this->counter_ = COUNTER::create_strong (); this->ptr_ = p.release (); if (COUNTER::detach_strong (old_counter) == 0) |