summaryrefslogtreecommitdiff
path: root/ace/Malloc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ace/Malloc.cpp')
-rw-r--r--ace/Malloc.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp
index 9f630abac94..8cc622a7c00 100644
--- a/ace/Malloc.cpp
+++ b/ace/Malloc.cpp
@@ -90,8 +90,12 @@ ACE_Allocator::instance (void)
// destroy it.
static void *allocator_instance = 0;
- // Check this critical assumption . . .
- ACE_ASSERT (sizeof allocator_instance == sizeof (ACE_New_Allocator));
+ // Check this critical assumption.
+ // We put it in a variable first to avoid stupid compiler
+ // warnings that the condition may always be true/false.
+ int assertion = (sizeof allocator_instance ==
+ sizeof (ACE_New_Allocator));
+ ACE_ASSERT (assertion);
// Initialize the allocator_instance by using a placement
// new. The ACE_NEW_RETURN below doesn't actually allocate