diff options
| author | nw1 <nw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-10 01:07:17 +0000 |
|---|---|---|
| committer | nw1 <nw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-10 01:07:17 +0000 |
| commit | 6f61563ed0f8013d3997eb06ec2f7fd651444e0c (patch) | |
| tree | 24ee1b23ce572740d752bf374152d3dfb1ea5a14 | |
| parent | c8460286e5c6ab407f3dd46e8c0ddb3cd4278fc1 (diff) | |
| download | ATCD-6f61563ed0f8013d3997eb06ec2f7fd651444e0c.tar.gz | |
Added more static cast.
| -rw-r--r-- | ace/Hash_Map_Manager.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ace/Hash_Map_Manager.cpp b/ace/Hash_Map_Manager.cpp index 75a399b8707..86cfe330c4e 100644 --- a/ace/Hash_Map_Manager.cpp +++ b/ace/Hash_Map_Manager.cpp @@ -609,7 +609,7 @@ ACE_Hash_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::done (void) const ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->map_man_->lock_, -1); return this->map_man_->table_ == 0 - || this->index_ >= this->map_man_->total_size_ + || this->index_ >= ACE_static_cast (ssize_t, this->map_man_->total_size_) || this->index_ <= -1; } @@ -630,7 +630,7 @@ ACE_Hash_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::forward_i (void) } else if (this->index_ >= ACE_static_cast(ssize_t, this->map_man_->total_size_)) return 0; - + this->next_ = this->next_->next_; if (this->next_ == &this->map_man_->table_[this->index_]) { @@ -875,7 +875,7 @@ ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::next (ACE_Hash_Map_Entry<EXT_ID ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->map_man_->lock_, -1); if (this->map_man_->table_ != 0 - && this->index_ < this->map_man_->total_size_ + && this->index_ < ACE_static_cast (ssize_t, this->map_man_->total_size_) && this->next_ != &this->map_man_->table_[this->index_]) { entry = this->next_; @@ -891,7 +891,7 @@ ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::done (void) const ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->map_man_->lock_, -1); if (this->map_man_->table_ != 0 - && this->index_ < this->map_man_->total_size_ + && this->index_ < ACE_static_cast (ssize_t, this->map_man_->total_size_) && this->next_ != &this->map_man_->table_[this->index_]) return 0; else @@ -909,7 +909,7 @@ ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance (void) if (this->next_->next_ != &this->map_man_->table_[this->index_]) this->next_ = this->next_->next_; else - while (++this->index_ < this->map_man_->total_size_) + while (++this->index_ < ACE_static_cast (ssize_t, this->map_man_->total_size_)) { this->next_ = &this->map_man_->table_[this->index_]; if (this->next_->next_ != &this->map_man_->table_[this->index_]) @@ -919,7 +919,7 @@ ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance (void) } } - return this->index_ < this->map_man_->total_size_ + return this->index_ < ACE_static_cast (ssize_t, this->map_man_->total_size_) && this->next_ != &this->map_man_->table_[this->index_]; } |