aboutsummaryrefslogtreecommitdiff
path: root/dep/acelite/ace/Malloc_Base.h
diff options
context:
space:
mode:
authorclick <none@none>2010-11-04 05:30:29 +0100
committerclick <none@none>2010-11-04 05:30:29 +0100
commit9b16ee203f3f8e6e21c4864bd3308bf58c7b6800 (patch)
tree14950af01860fc520bbbd320c7ad81ef0281cbf3 /dep/acelite/ace/Malloc_Base.h
parent2604250c3c4efd93e9977f2eb72d6398a7a7bcb2 (diff)
Dep/ACE: Upgrade ACE -library to 5.8.3
--HG-- branch : trunk
Diffstat (limited to 'dep/acelite/ace/Malloc_Base.h')
-rw-r--r--dep/acelite/ace/Malloc_Base.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/dep/acelite/ace/Malloc_Base.h b/dep/acelite/ace/Malloc_Base.h
index d800c7fe544..35e46685126 100644
--- a/dep/acelite/ace/Malloc_Base.h
+++ b/dep/acelite/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 92085 2010-09-29 12:23:13Z johnnyw $
*
* @author Doug Schmidt and Irfan Pyarali
*/
@@ -85,7 +85,7 @@ public:
* Associate @a name with @a pointer. If @a duplicates == 0 then do
* not allow duplicate @a name/@a pointer associations, else if
* @a duplicates != 0 then allow duplicate @a name/@a pointer
- * assocations. Returns 0 if successfully binds (1) a previously
+ * associations. Returns 0 if successfully binds (1) a previously
* unbound @a name or (2) @a duplicates != 0, returns 1 if trying to
* bind a previously bound @a name and @a duplicates == 0, else
* returns -1 if a resource failure occurs.