diff options
| author | jxh <jxh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-08-07 17:02:29 +0000 |
|---|---|---|
| committer | jxh <jxh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-08-07 17:02:29 +0000 |
| commit | f3c5981d3deb43fac889f28aeb0bfa920b6691b6 (patch) | |
| tree | 3f5a1376c829d81f0c433f87f4020fc8b1483932 /ace/Filecache.cpp | |
| parent | 459270382f3660294f5cd3271916eb3bb307748e (diff) | |
| download | ATCD-f3c5981d3deb43fac889f28aeb0bfa920b6691b6.tar.gz | |
> > "Filecache.cpp", line 477: warning(3666): variable "handle" was set
> > but never used
> > ACE_Filecache_Object *handle = 0;
Fixed.
> > "/usr/local/src/ace/current/ace/Hash_Map_Manager.cpp", line 205:
> > error(3873): expression must have class type
> > return ext_id.hash ();
Fixed in Filecache.
Diffstat (limited to 'ace/Filecache.cpp')
| -rw-r--r-- | ace/Filecache.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/ace/Filecache.cpp b/ace/Filecache.cpp index aa194347cd8..95d623848d7 100644 --- a/ace/Filecache.cpp +++ b/ace/Filecache.cpp @@ -474,7 +474,6 @@ ACE_Filecache_Object * ACE_Filecache::finish (ACE_Filecache_Object *&file) { int result; - ACE_Filecache_Object *handle = 0; u_long loc = ACE::hash_pjw (file->filename_) % this->size_; ACE_SYNCH_RW_MUTEX &hashlock = ACE_Filecache::hash_lock_[loc]; @@ -489,7 +488,7 @@ ACE_Filecache::finish (ACE_Filecache_Object *&file) file->release (); - handle = this->remove_i ((char *) file->filename_); + this->remove_i ((char *) file->filename_); result = this->hash_.bind (file->filename_, file); if (result == 0) @@ -776,11 +775,23 @@ ACE_Filecache_Object::update (void) const } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION) template class ACE_Hash_Map_Entry<const char *, ACE_Filecache_Object *>; template class ACE_Hash_Map_Manager<const char *, ACE_Filecache_Object *, ACE_Null_Mutex>; template class ACE_Hash_Map_Iterator<const char *, ACE_Filecache_Object *, ACE_Null_Mutex>; +#else +template class ACE_Hash_Map_Entry<ACE_CString, ACE_Filecache_Object *>; +template class ACE_Hash_Map_Manager<ACE_CString, ACE_Filecache_Object *, ACE_Null_Mutex>; +template class ACE_Hash_Map_Iterator<ACE_CString, ACE_Filecache_Object *, ACE_Null_Mutex>; +#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION) #pragma instantiate ACE_Hash_Map_Entry<const char *, ACE_Filecache_Object *>; #pragma instantiate ACE_Hash_Map_Manager<const char *, ACE_Filecache_Object *, ACE_Null_Mutex>; #pragma instantiate ACE_Hash_Map_Iterator<const char *, ACE_Filecache_Object *, ACE_Null_Mutex>; +#else +#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, ACE_Filecache_Object *>; +#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, ACE_Filecache_Object *, ACE_Null_Mutex>; +#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, ACE_Filecache_Object *, ACE_Null_Mutex>; +#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |