diff options
author | bala <balanatarajan@users.noreply.github.com> | 2001-08-09 22:00:02 +0000 |
---|---|---|
committer | bala <balanatarajan@users.noreply.github.com> | 2001-08-09 22:00:02 +0000 |
commit | a50d021f43641485f5cc3afb0b6d4d17dcc0514e (patch) | |
tree | 65371e346f2818a0a321a278b4fc7ac5d853e3ec | |
parent | 5c0bcd69365785764c7bc310c36b349d3df95010 (diff) | |
download | ATCD-a50d021f43641485f5cc3afb0b6d4d17dcc0514e.tar.gz |
ChangeLogTag: Thu Aug 9 16:56:05 2001 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-02a | 11 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 11 | ||||
-rw-r--r-- | ace/Hash_Map_Manager_T.cpp | 9 | ||||
-rw-r--r-- | ace/Hash_Map_Manager_T.i | 8 |
5 files changed, 41 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 14db7aa0733..b83d33d9eaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Thu Aug 9 16:56:05 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/Hash_Map_Manager_T.i: + * ace/Hash_Map_Manager_T.cpp: We seem to be re-inventing wheels + again and again. A few months back we had a show stopper in a + beta which was caused by usage of static cast. The cast was not + to the liking of SunCC 4.2. Looks like we had to change a bunch + of static cast sprayed in these two files to a C style cast as + 4.2 doesnt like them. Compilers like Borland handle these + better, but not 4.2. + Thu Aug 9 11:51:10 2001 Balachandran Natarajan <bala@cs.wustl.edu> * include/makeinclude/platform_hpux_aCC.GNU: On popular mandate we diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 14db7aa0733..b83d33d9eaf 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,14 @@ +Thu Aug 9 16:56:05 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/Hash_Map_Manager_T.i: + * ace/Hash_Map_Manager_T.cpp: We seem to be re-inventing wheels + again and again. A few months back we had a show stopper in a + beta which was caused by usage of static cast. The cast was not + to the liking of SunCC 4.2. Looks like we had to change a bunch + of static cast sprayed in these two files to a C style cast as + 4.2 doesnt like them. Compilers like Borland handle these + better, but not 4.2. + Thu Aug 9 11:51:10 2001 Balachandran Natarajan <bala@cs.wustl.edu> * include/makeinclude/platform_hpux_aCC.GNU: On popular mandate we diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 14db7aa0733..b83d33d9eaf 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,14 @@ +Thu Aug 9 16:56:05 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/Hash_Map_Manager_T.i: + * ace/Hash_Map_Manager_T.cpp: We seem to be re-inventing wheels + again and again. A few months back we had a show stopper in a + beta which was caused by usage of static cast. The cast was not + to the liking of SunCC 4.2. Looks like we had to change a bunch + of static cast sprayed in these two files to a C style cast as + 4.2 doesnt like them. Compilers like Borland handle these + better, but not 4.2. + Thu Aug 9 11:51:10 2001 Balachandran Natarajan <bala@cs.wustl.edu> * include/makeinclude/platform_hpux_aCC.GNU: On popular mandate we diff --git a/ace/Hash_Map_Manager_T.cpp b/ace/Hash_Map_Manager_T.cpp index a45e064d336..669ca4bc756 100644 --- a/ace/Hash_Map_Manager_T.cpp +++ b/ace/Hash_Map_Manager_T.cpp @@ -471,14 +471,13 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_ this->index_++; return this->forward_i (); } - else if (this->index_ >= ACE_static_cast (ssize_t, this->map_man_->total_size_)) + else if (this->index_ >= (ssize_t) this->map_man_->total_size_) return 0; this->next_ = this->next_->next_; if (this->next_ == &this->map_man_->table_[this->index_]) { - while (++this->index_ < ACE_static_cast (ssize_t, - this->map_man_->total_size_)) + while (++this->index_ < (ssize_t) this->map_man_->total_size_) { this->next_ = this->map_man_->table_[this->index_].next_; if (this->next_ != &this->map_man_->table_[this->index_]) @@ -486,7 +485,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_ } } - return this->index_ < ACE_static_cast (ssize_t, this->map_man_->total_size_); + return this->index_ < (ssize_t) this->map_man_->total_size_; } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int @@ -496,7 +495,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_ if (this->map_man_->table_ == 0) return -1; - else if (this->index_ == ACE_static_cast (ssize_t, this->map_man_->total_size_)) + else if (this->index_ == (ssize_t) this->map_man_->total_size_) { this->index_--; return this->reverse_i (); diff --git a/ace/Hash_Map_Manager_T.i b/ace/Hash_Map_Manager_T.i index 43ab4c15ce2..d57997a72bf 100644 --- a/ace/Hash_Map_Manager_T.i +++ b/ace/Hash_Map_Manager_T.i @@ -375,7 +375,7 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_Hash_Map_Iterator_Base_Ex (ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &mm, int head) : map_man_ (&mm), - index_ (head != 0 ? -1 : ACE_static_cast (ssize_t, mm.total_size_)), + index_ (head != 0 ? -1 : (ssize_t) mm.total_size_), next_ (0) { ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_Hash_Map_Iterator_Base_Ex"); @@ -458,7 +458,7 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_Hash_Map_Const_Iterator_Base_Ex (const ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &mm, int head) : map_man_ (&mm), - index_ (head != 0 ? -1 : ACE_static_cast (ssize_t, mm.total_size_)), + index_ (head != 0 ? -1 : (ssize_t) mm.total_size_), next_ (0) { ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_Hash_Map_Const_Iterator_Base_Ex"); @@ -473,7 +473,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_ ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::next"); if (this->map_man_->table_ != 0 - && this->index_ < ACE_static_cast (ssize_t, this->map_man_->total_size_) + && this->index_ < (ssize_t) this->map_man_->total_size_ && this->index_ >= 0 && this->next_ != &this->map_man_->table_[this->index_]) { @@ -490,7 +490,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_ ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done"); return this->map_man_->table_ == 0 - || this->index_ >= ACE_static_cast (ssize_t, this->map_man_->total_size_) + || this->index_ >= (ssize_t) this->map_man_->total_size_ || this->index_ < 0; } |