diff options
Diffstat (limited to 'ace/PI_Malloc.h')
| -rw-r--r-- | ace/PI_Malloc.h | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/ace/PI_Malloc.h b/ace/PI_Malloc.h index b3937a7ff85..6306b76708c 100644 --- a/ace/PI_Malloc.h +++ b/ace/PI_Malloc.h @@ -16,7 +16,12 @@ #include /**/ "ace/pre.h" -#include "ace/ACE_export.h" +#ifdef ACE_MEMORY_BUILD_DLL +# include "ace/ACE_Memory_export.h" +#else +# include "ace/ACE_export.h" +# define ACE_Memory_Export ACE_Export +#endif /* ACE_MEMORY_BUILD_DLL */ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,13 +32,11 @@ #include "ace/Malloc.h" #include "ace/Based_Pointer_T.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - // prepare for position independent malloc /** * @class ACE_PI_Control_Block * - * @brief This information is stored in memory allocated by the Memory_Pool. + * @brief This information is stored in memory allocated by the <Memory_Pool>. * * This class implements the control block structure that can be * used in a "position indepent" fashion, i.e., you don't need to @@ -41,7 +44,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * processes sharing the memory. The tradoff of this flexibility * is more expensive malloc/free operations. */ -class ACE_Export ACE_PI_Control_Block +class ACE_Memory_Export ACE_PI_Control_Block { public: class ACE_Malloc_Header; @@ -54,11 +57,11 @@ public: /** * @class ACE_Malloc_Header * - * @brief This is the control block header. It's used by ACE_Malloc + * @brief This is the control block header. It's used by <ACE_Malloc> * to keep track of each chunk of data when it's in the free * list or in use. */ - class ACE_Export ACE_Malloc_Header + class ACE_Memory_Export ACE_Malloc_Header { public: ACE_Malloc_Header (void); @@ -83,23 +86,20 @@ public: void dump (void) const; private: - - // Disallow assignment. - void operator= (const ACE_Malloc_Header &); - + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Malloc_Header &)) }; /** * @class ACE_Name_Node * - * @brief This class supports "named memory regions" within ACE_Malloc. + * @brief This class supports "named memory regions" within <ACE_Malloc>. * * Internally, the named memory regions are stored as a - * doubly-linked list within the Memory_Pool. This makes + * doubly-linked list within the <Memory_Pool>. This makes * it easy to iterate over the items in the list in both FIFO * and LIFO order. */ - class ACE_Export ACE_Name_Node + class ACE_Memory_Export ACE_Name_Node { public: // = Initialization methods. @@ -145,9 +145,7 @@ public: void dump (void) const; private: - - // Disallow assignment. - void operator= (const ACE_Name_Node &); + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Name_Node &)) }; /// Print out a bunch of size info for debugging. @@ -194,13 +192,9 @@ public: void dump (void) const; private: - - // Disallow assignment. - void operator= (const ACE_Control_Block &); + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Control_Block &)) }; -ACE_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "ace/PI_Malloc.inl" #endif /* __ACE_INLINE__ */ |