diff options
Diffstat (limited to 'ace/Malloc_T.h')
| -rw-r--r-- | ace/Malloc_T.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h index 021a13c2e58..241d1529f49 100644 --- a/ace/Malloc_T.h +++ b/ace/Malloc_T.h @@ -16,7 +16,6 @@ #include /**/ "ace/pre.h" #include "ace/Malloc.h" /* Need ACE_Control_Block */ -#include "ace/Malloc_Base.h" /* Need ACE_Allocator */ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,8 +25,6 @@ #include "ace/Free_List.h" #include "ace/Guard_T.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class ACE_Cached_Mem_Pool_Node * @@ -238,14 +235,13 @@ 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_TO_TCHAR_IN (pool_name), + ACE_TEXT_TO_TCHAR_IN (lock_name), options) { ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter"); } -#if defined (ACE_HAS_WCHAR) /** * Note that @a pool_name should be located in * a directory with the appropriate visibility and protection so @@ -261,13 +257,12 @@ 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_TO_TCHAR_IN (pool_name), + ACE_TEXT_TO_TCHAR_IN (lock_name), options) { ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter"); } -#endif /* ACE_HAS_WCHAR */ /// Destructor. virtual ~ACE_Allocator_Adapter (void); @@ -891,8 +886,6 @@ public: ACE_LOCK * operator () (const ACE_TCHAR *myname); }; -ACE_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "ace/Malloc_T.inl" #endif /* __ACE_INLINE__ */ |