mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 19:37:03 +00:00
Some missing from merge.
Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
parent
ec939a5bce
commit
f4be15a7af
1895 changed files with 160408 additions and 53601 deletions
|
|
@ -1,3 +1,5 @@
|
|||
// $Id: Filecache.cpp 97202 2013-06-19 22:35:11Z mesnier_p $
|
||||
|
||||
#include "ace/Filecache.h"
|
||||
#include "ace/Object_Manager.h"
|
||||
#include "ace/Log_Category.h"
|
||||
|
|
@ -171,11 +173,7 @@ ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (ACE_Filecache_Hash_Entry *next,
|
|||
template <>
|
||||
ACE_Filecache_Hash_Entry::~ACE_Hash_Map_Entry (void)
|
||||
{
|
||||
#if defined (ACE_HAS_ALLOC_HOOKS)
|
||||
ACE_Allocator::instance()->free ((void *) ext_id_);
|
||||
#else
|
||||
ACE_OS::free ((void *) ext_id_);
|
||||
#endif /* ACE_HAS_ALLOC_HOOKS */
|
||||
}
|
||||
|
||||
// We need these template specializations since KEY is defined as a
|
||||
|
|
@ -236,8 +234,6 @@ ACE_Filecache::~ACE_Filecache (void)
|
|||
{
|
||||
}
|
||||
|
||||
ACE_ALLOC_HOOK_DEFINE(ACE_Filecache)
|
||||
|
||||
ACE_Filecache_Object *
|
||||
ACE_Filecache::insert_i (const ACE_TCHAR *filename,
|
||||
ACE_SYNCH_RW_MUTEX &filelock,
|
||||
|
|
@ -624,8 +620,6 @@ ACE_Filecache_Object::~ACE_Filecache_Object (void)
|
|||
this->lock_.release ();
|
||||
}
|
||||
|
||||
ACE_ALLOC_HOOK_DEFINE(ACE_Filecache_Object)
|
||||
|
||||
int
|
||||
ACE_Filecache_Object::acquire (void)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue