From 855bf575a69f50550652a233381c0a4cd577b98a Mon Sep 17 00:00:00 2001 From: sma Date: Wed, 28 May 2008 13:46:21 +0000 Subject: ChangeLogTag: Wed May 28 13:46:00 UTC 2008 Simon Massey --- ACE/ChangeLog | 5 +++++ ACE/ace/Malloc.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * ace/Malloc.h: + Eliminate a warning from some fanicaly builds. + Wed May 28 08:10:00 UTC 2008 Simon Massey * 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. -- cgit v1.2.1