diff options
author | Steve Huston <shuston@riverace.com> | 2005-02-15 23:07:37 +0000 |
---|---|---|
committer | Steve Huston <shuston@riverace.com> | 2005-02-15 23:07:37 +0000 |
commit | 34104cf059eeafbd1382ac7f9315e0c9a4afac2e (patch) | |
tree | 929cad045679537bffe42e0311c7d1ac90539359 /ace/Obstack_T.cpp | |
parent | 2cf1b9573c6f58e31ad17124620d11875cf8dab9 (diff) | |
download | ATCD-PROACTOR_FIXES_STEVE_JAN05.tar.gz |
Commit merged-in changes from mainlinePROACTOR_FIXES_STEVE_JAN05
Diffstat (limited to 'ace/Obstack_T.cpp')
-rw-r--r-- | ace/Obstack_T.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ace/Obstack_T.cpp b/ace/Obstack_T.cpp index b32171b7337..4fdeeae1c26 100644 --- a/ace/Obstack_T.cpp +++ b/ace/Obstack_T.cpp @@ -95,8 +95,7 @@ ACE_Obstack_T<CHAR>::grow (CHAR c) if (this->request (1) == 0) { - CHAR *retv = ACE_reinterpret_cast (CHAR *, - this->curr_->cur_); + CHAR *retv = reinterpret_cast<CHAR *> (this->curr_->cur_); this->curr_->cur_ += sizeof (CHAR); *retv = c; return retv; @@ -113,8 +112,7 @@ ACE_Obstack_T<CHAR>::new_chunk (void) ACE_Obchunk *temp; ACE_NEW_MALLOC_RETURN (temp, - ACE_static_cast (ACE_Obchunk *, - this->allocator_strategy_->malloc + static_cast<ACE_Obchunk *> (this->allocator_strategy_->malloc (sizeof (class ACE_Obchunk) + this->size_)), ACE_Obchunk (this->size_), 0); @@ -172,8 +170,7 @@ template <class CHAR> void ACE_Obstack_T<CHAR>::unwind (void* obj) { if (obj >= this->curr_->contents_ && obj < this->curr_->end_) - this->curr_->block_ = this->curr_->cur_ = ACE_reinterpret_cast (char*, - obj); + this->curr_->block_ = this->curr_->cur_ = reinterpret_cast<char*> (obj); else this->unwind_i (obj); } @@ -189,8 +186,7 @@ ACE_Obstack_T<CHAR>::unwind_i (void* obj) if (curr) { this->curr_ = curr; - this->curr_->block_ = this->curr_->cur_ = ACE_reinterpret_cast (char*, - obj); + this->curr_->block_ = this->curr_->cur_ = reinterpret_cast<char*> (obj); } else if (obj != 0) ACE_ERROR ((LM_ERROR, |