diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-28 13:46:21 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-28 13:46:21 +0000 |
| commit | 855bf575a69f50550652a233381c0a4cd577b98a (patch) | |
| tree | 827df34a7c0eadf5e98a63cf1f902c631dd33337 | |
| parent | 9fc1da11a67a770ed68a1b98a77be32288926286 (diff) | |
| download | ATCD-855bf575a69f50550652a233381c0a4cd577b98a.tar.gz | |
ChangeLogTag: Wed May 28 13:46:00 UTC 2008 Simon Massey <sma at prismtech dot com>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/Malloc.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 19392ec282e..8cc44d4c262 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Wed May 28 13:46:00 UTC 2008 Simon Massey <sma at prismtech dot com> + + * ace/Malloc.h: + Eliminate a warning from some fanicaly builds. + Wed May 28 08:10:00 UTC 2008 Simon Massey <sma at prismtech dot com> * tests/Bug_3332_Regression_Test.cpp: diff --git a/ACE/ace/Malloc.h b/ACE/ace/Malloc.h index 5dd76d47dd3..d14733690d4 100644 --- a/ACE/ace/Malloc.h +++ b/ACE/ace/Malloc.h @@ -234,7 +234,7 @@ union ACE_max_align_info #endif /* ACE_MALLOC_ALIGN */ #if !defined ACE_MALLOC_ROUNDUP -# define ACE_MALLOC_ROUNDUP(X, Y) ((X) + ((Y) - 1) & ~((Y) - 1)) +# define ACE_MALLOC_ROUNDUP(X, Y) (((X) + ((Y) - 1)) & ~((Y) - 1)) #endif // ACE_MALLOC_HEADER_SIZE is the normalized malloc header size. |