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/Hash_Map_Manager_T.inl | |
| parent | 2cf1b9573c6f58e31ad17124620d11875cf8dab9 (diff) | |
| download | ATCD-PROACTOR_FIXES_STEVE_JAN05.tar.gz | |
Commit merged-in changes from mainlinePROACTOR_FIXES_STEVE_JAN05
Diffstat (limited to 'ace/Hash_Map_Manager_T.inl')
| -rw-r--r-- | ace/Hash_Map_Manager_T.inl | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ace/Hash_Map_Manager_T.inl b/ace/Hash_Map_Manager_T.inl index d1b05afa492..05383a07e69 100644 --- a/ace/Hash_Map_Manager_T.inl +++ b/ace/Hash_Map_Manager_T.inl @@ -202,8 +202,8 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::find INT_ID &int_id) const { ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *nc_this = - (ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *) - this; + const_cast <ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *> + (this); ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, nc_this->lock_, -1); @@ -214,8 +214,9 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::find (const EXT_ID &ext_id) const { ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *nc_this = - (ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *) - this; + const_cast <ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *> + (this); + ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, nc_this->lock_, -1); return nc_this->find_i (ext_id); @@ -234,8 +235,8 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::find ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry) const { ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *nc_this = - (ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *) - this; + const_cast <ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *> + (this); ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, nc_this->lock_, -1); |