diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-23 17:03:27 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-23 17:03:27 +0000 |
| commit | 938e05394eb8241564789d3e5ea856e45bc07433 (patch) | |
| tree | 6825eff866518f9f0dd1232a05391af1766c59cf /ace/Malloc_T.h | |
| parent | ae33874ebb2009d0236ed4b104ec21bf5584d5b2 (diff) | |
| download | ATCD-938e05394eb8241564789d3e5ea856e45bc07433.tar.gz | |
ChangeLogTag:Mon Oct 23 10:02:36 2000 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'ace/Malloc_T.h')
| -rw-r--r-- | ace/Malloc_T.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h index 21db9b71c0d..1101271d405 100644 --- a/ace/Malloc_T.h +++ b/ace/Malloc_T.h @@ -122,8 +122,8 @@ public: ACE_Allocator_Adapter (const char *pool_name, const char *lock_name, MEMORY_POOL_OPTIONS options = 0) - : allocator_ (ACE_TEXT_CHAR_TO_TCHAR (pool_name), - ACE_TEXT_CHAR_TO_TCHAR (lock_name), + : allocator_ (ACE_TEXT_CHAR_TO_TCHAR (pool_name), + ACE_TEXT_CHAR_TO_TCHAR (lock_name), options) { ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter"); @@ -136,8 +136,8 @@ public: ACE_Allocator_Adapter (const wchar_t *pool_name, const wchar_t *lock_name, MEMORY_POOL_OPTIONS options = 0) - : allocator_ (ACE_TEXT_WCHAR_TO_TCHAR (pool_name), - ACE_TEXT_WCHAR_TO_TCHAR (lock_name), + : allocator_ (ACE_TEXT_WCHAR_TO_TCHAR (pool_name), + ACE_TEXT_WCHAR_TO_TCHAR (lock_name), options) { ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter"); @@ -333,6 +333,12 @@ public: void *calloc (size_t nbytes, char initial_value = '\0'); // Allocate <nbytes>, giving them <initial_value>. + void *calloc (size_t n_elem, + size_t elem_size, + char initial_value = '\0'); + // Allocate <n_elem> each of size <elem_size>, giving them + // <initial_value>. + void free (void *ptr); // Deallocate memory pointed to by <ptr>, which must have been // allocated previously by <this->malloc>. |