aboutsummaryrefslogtreecommitdiff
path: root/externals/ace/Malloc_Base.h
diff options
context:
space:
mode:
authorsilinoron <none@none>2010-08-15 13:21:26 -0700
committersilinoron <none@none>2010-08-15 13:21:26 -0700
commit05e6147621b53a6d90b57469660c2c656f83196d (patch)
tree3bbecb6641edf2e47501a854e6c667421da44b23 /externals/ace/Malloc_Base.h
parente1fe290b21dadd85397eb4e415df6b2dc66aa972 (diff)
parent4d5296299b7a72c37cda56bfa885c82167066c3c (diff)
merge
--HG-- branch : trunk
Diffstat (limited to 'externals/ace/Malloc_Base.h')
-rw-r--r--externals/ace/Malloc_Base.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/externals/ace/Malloc_Base.h b/externals/ace/Malloc_Base.h
index d800c7fe544..6a13d020ad6 100644
--- a/externals/ace/Malloc_Base.h
+++ b/externals/ace/Malloc_Base.h
@@ -4,7 +4,7 @@
/**
* @file Malloc_Base.h
*
- * $Id: Malloc_Base.h 91058 2010-07-12 08:20:09Z johnnyw $
+ * $Id: Malloc_Base.h 80826 2008-03-04 14:51:23Z wotte $
*
* @author Doug Schmidt and Irfan Pyarali
*/
@@ -73,7 +73,7 @@ public:
size_type elem_size,
char initial_value = '\0') = 0;
- /// Free @a ptr (must have been allocated by ACE_Allocator::malloc()).
+ /// Free <ptr> (must have been allocated by <ACE_Allocator::malloc>).
virtual void free (void *ptr) = 0;
/// Remove any resources associated with this memory manager.