diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-11-25 08:19:09 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-11-25 08:19:09 +0000 |
| commit | 97da4d7d8a48d878530f3ef832851fd490e35444 (patch) | |
| tree | f7cf795aa8f14732b25d9867e63ef89f1eb6172c | |
| parent | c2849c3f66a1996419bd61bc35de8fb1b7521d08 (diff) | |
| download | ATCD-97da4d7d8a48d878530f3ef832851fd490e35444.tar.gz | |
ChangeLogTag:Thu Nov 25 02:17:34 1999 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | ChangeLog-99b | 5 | ||||
| -rw-r--r-- | ace/Malloc.h | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 96f5a2cf7bc..d76db0a6bbb 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,8 @@ +Thu Nov 25 02:17:34 1999 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/Malloc.h: Added back some apparent bug fixes during the + alignment change. + Thu Nov 25 01:41:33 1999 Nanbor Wang <nanbor@cs.wustl.edu> * ace/Malloc.h: Removed the alignment change for now. diff --git a/ace/Malloc.h b/ace/Malloc.h index dda89e07359..4d089b2832a 100644 --- a/ace/Malloc.h +++ b/ace/Malloc.h @@ -105,7 +105,7 @@ public: #if (ACE_MALLOC_PADDING > 1) #define ACE_MALLOC_PADDING_SIZE ((ACE_MALLOC_PADDING - \ - (sizeof (ACE_Malloc_Header)) / sizeof (long))) + (sizeof (ACE_MALLOC_HEADER_PTR) + sizeof (size_t)) / sizeof (long))) long padding_[ACE_MALLOC_PADDING_SIZE < 1 ? 1 : ACE_MALLOC_PADDING_SIZE]; #endif /* ACE_MALLOC_PADDING > 0 */ @@ -193,13 +193,13 @@ public: #if defined (ACE_HAS_MALLOC_STATS) // Keep statistics about ACE_Malloc state and performance. ACE_Malloc_Stats malloc_stats_; -#define ACE_CONTROL_BLOCK_SIZE ((int)(sizeof (ACE_Name_Node *) \ - + sizeof (ACE_Malloc_Header *) \ +#define ACE_CONTROL_BLOCK_SIZE ((int)(sizeof (ACE_NAME_NODE_PTR) \ + + sizeof (ACE_MALLOC_HEADER_PTR) \ + MAXNAMELEN \ + sizeof (ACE_Malloc_Stats))) #else -#define ACE_CONTROL_BLOCK_SIZE ((int)(sizeof (ACE_Name_Node *) \ - + sizeof (ACE_Malloc_Header *) \ +#define ACE_CONTROL_BLOCK_SIZE ((int)(sizeof (ACE_NAME_NODE_PTR) \ + + sizeof (ACE_MALLOC_HEADER_PTR *) \ + MAXNAMELEN)) #endif /* ACE_HAS_MALLOC_STATS */ |