diff options
| author | Steve Huston <shuston@riverace.com> | 1999-03-02 20:42:55 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 1999-03-02 20:42:55 +0000 |
| commit | c5537beaf8fea5dd528c9c62acc46646512d67b4 (patch) | |
| tree | 7c2c46d2f72ffb3bcb376d3eb4e608d41bb3edd4 /ace/Map_T.i | |
| parent | 805ab410f2d9da2af3e31f1045a5bb85a69574c4 (diff) | |
| download | ATCD-c5537beaf8fea5dd528c9c62acc46646512d67b4.tar.gz | |
More fully qualified types inherited from templated base classes and
fully qualified some with ACE_TYPENAME where needed. Now aC++ is happy.
Diffstat (limited to 'ace/Map_T.i')
| -rw-r--r-- | ace/Map_T.i | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ace/Map_T.i b/ace/Map_T.i index 6e4f4907bac..013b17feb18 100644 --- a/ace/Map_T.i +++ b/ace/Map_T.i @@ -564,7 +564,7 @@ ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::compare (const ACE_Iterator_I template <class T, class VALUE> ACE_INLINE T ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::dereference () const { - ACE_Active_Map_Manager<VALUE>::ENTRY &entry = *this->implementation_; + ACE_TYPENAME ACE_Active_Map_Manager<VALUE>::ENTRY &entry = *this->implementation_; return T (entry.int_id_.first (), entry.int_id_.second ()); } @@ -619,7 +619,7 @@ ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::compare (const ACE_Re template <class T, class VALUE> ACE_INLINE T ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::dereference () const { - ACE_Active_Map_Manager<VALUE>::ENTRY &entry = *this->implementation_; + ACE_TYPENAME ACE_Active_Map_Manager<VALUE>::ENTRY &entry = *this->implementation_; return T (entry.int_id_.first (), entry.int_id_.second ()); } @@ -1028,7 +1028,7 @@ ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>: template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_INLINE T ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::dereference () const { - ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::ENTRY &entry = *this->implementation_; + ACE_TYPENAME ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::ENTRY &entry = *this->implementation_; return T (entry.ext_id_, entry.int_id_); } @@ -1083,7 +1083,7 @@ ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPAR template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_INLINE T ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::dereference () const { - ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::ENTRY &entry = *this->implementation_; + ACE_TYPENAME ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::ENTRY &entry = *this->implementation_; return T (entry.ext_id_, entry.int_id_); } @@ -1342,7 +1342,7 @@ ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::compare (const ACE_Iterator_Imp template <class T, class KEY, class VALUE> ACE_INLINE T ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::dereference () const { - ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::ENTRY &entry = *this->implementation_; + ACE_TYPENAME ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::ENTRY &entry = *this->implementation_; return T (entry.ext_id_, entry.int_id_); } @@ -1397,7 +1397,7 @@ ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::compare (const ACE_Reve template <class T, class KEY, class VALUE> ACE_INLINE T ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::dereference () const { - ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::ENTRY &entry = *this->implementation_; + ACE_TYPENAME ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::ENTRY &entry = *this->implementation_; return T (entry.ext_id_, entry.int_id_); } |