diff options
Diffstat (limited to 'ace/Malloc.h')
| -rw-r--r-- | ace/Malloc.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/ace/Malloc.h b/ace/Malloc.h index d19a5f12ebb..5362c0baaf6 100644 --- a/ace/Malloc.h +++ b/ace/Malloc.h @@ -33,6 +33,9 @@ # define ACE_PROCESS_MUTEX ACE_SV_Semaphore_Simple # endif /* ACE_HAS_THREADS */ + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + typedef ACE_Atomic_Op<ACE_PROCESS_MUTEX, int> ACE_INT; /****************************************************************** @@ -198,6 +201,9 @@ struct ACE_Export ACE_Malloc_Stats /// Number of blocks in use ACE_INT ninuse_; }; + +ACE_END_VERSIONED_NAMESPACE_DECL + # define ACE_MALLOC_STATS(X) X #else # define ACE_MALLOC_STATS(X) @@ -212,6 +218,8 @@ struct ACE_Export ACE_Malloc_Stats # define ACE_MALLOC_PADDING 1 #endif /* ACE_MALLOC_PADDING */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + union ACE_max_align_info { int (*i)(); @@ -301,9 +309,6 @@ public: char *pointer, ACE_Name_Node *head); - /// Copy constructor. - ACE_Name_Node (const ACE_Name_Node &); - /// Constructor. ACE_Name_Node (void); @@ -318,9 +323,6 @@ public: /// Return a pointer to the name of this node. const char *name (void) const; - /// Assign a name; - void name (const char *); - /// Name of the Node. char *name_; @@ -335,6 +337,9 @@ public: /// Dump the state of the object. void dump (void) const; + private: + /// Copy constructor. + ACE_Name_Node (const ACE_Name_Node &); }; /// Print out a bunch of size info for debugging. @@ -380,6 +385,8 @@ public: void dump (void) const; }; +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ace/Malloc.inl" #endif /* __ACE_INLINE__ */ |