summaryrefslogtreecommitdiff
path: root/ACE/ace/Filecache.cpp
diff options
context:
space:
mode:
authorAdam Mitz <mitza@ociweb.com>2015-11-06 17:07:11 -0600
committerAdam Mitz <mitza@ociweb.com>2015-11-06 17:07:11 -0600
commitac5e1702c9f9bee9f1f7bfce8c1a6f3847ea6b4b (patch)
tree0e70d1f51c39e688a05a6cdc2af58408222e4a0d /ACE/ace/Filecache.cpp
parent5272b5b81f92c298cb998b5bb0b0dbca3e7f29fe (diff)
downloadATCD-ac5e1702c9f9bee9f1f7bfce8c1a6f3847ea6b4b.tar.gz
Merged branch ace-face-safety (FACE Safety Profile import from OCITAO).
Diffstat (limited to 'ACE/ace/Filecache.cpp')
-rw-r--r--ACE/ace/Filecache.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/ACE/ace/Filecache.cpp b/ACE/ace/Filecache.cpp
index d6da738642a..6916367bc74 100644
--- a/ACE/ace/Filecache.cpp
+++ b/ACE/ace/Filecache.cpp
@@ -171,7 +171,11 @@ 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
@@ -232,6 +236,8 @@ 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,
@@ -618,6 +624,8 @@ ACE_Filecache_Object::~ACE_Filecache_Object (void)
this->lock_.release ();
}
+ACE_ALLOC_HOOK_DEFINE(ACE_Filecache_Object)
+
int
ACE_Filecache_Object::acquire (void)
{