diff options
Diffstat (limited to 'ace/Malloc_T.h')
| -rw-r--r-- | ace/Malloc_T.h | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h index ec4792c09cd..19b903771ef 100644 --- a/ace/Malloc_T.h +++ b/ace/Malloc_T.h @@ -113,17 +113,34 @@ public: #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ // = Initialization. - ACE_Allocator_Adapter (const ACE_TCHAR *pool_name = 0); + ACE_Allocator_Adapter (const char *pool_name = 0); - ACE_Allocator_Adapter (const ACE_TCHAR *pool_name, - const ACE_TCHAR *lock_name, + ACE_Allocator_Adapter (const char *pool_name, + const char *lock_name, MEMORY_POOL_OPTIONS options = 0) - : allocator_ (pool_name, lock_name, options) + : 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"); } // Constructor (this has to be inline to avoid bugs with some C++ compilers. +#if defined (ACE_HAS_WCHAR) + ACE_Allocator_Adapter (const wchar_t *pool_name); + + 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), + options) + { + ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter"); + } + // Constructor (this has to be inline to avoid bugs with some C++ compilers. +#endif /* ACE_HAS_WCHAR */ + virtual ~ACE_Allocator_Adapter (void); // Destructor. |