Use operator bool and removed obsolete comments

    * ACE/ace/CORBA_macros.h:
    * ACE/ace/OS_Memory.h:

2 files changed, 10 insertions, 18 deletions

diff --git a/ACE/ace/CORBA_macros.h b/ACE/ace/CORBA_macros.h
index b46306c5a58..f8b021ff3f0 100644
--- a/ACE/ace/CORBA_macros.h
+++ b/ACE/ace/CORBA_macros.h
@@ -24,9 +24,9 @@
 
 #include /**/ "ace/config-all.h"
 
-# if !defined (ACE_LACKS_PRAGMA_ONCE)
-#   pragma once
-# endif /* ACE_LACKS_PRAGMA_ONCE */
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#  pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #define ACE_NEW_THROW_EX(POINTER,CONSTRUCTOR,EXCEPTION) \
   do { POINTER = new (std::nothrow) CONSTRUCTOR;         \
@@ -36,15 +36,15 @@
 // FUZZ: disable check_for_ACE_Guard
 # define ACE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \
   ACE_Guard< MUTEX > OBJ (LOCK); \
-    if (OBJ.locked () == 0) throw EXCEPTION;
+    if (!OBJ.locked ()) throw EXCEPTION;
 
 # define ACE_READ_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \
   ACE_Read_Guard< MUTEX > OBJ (LOCK); \
-    if (OBJ.locked () == 0) throw EXCEPTION;
+    if (!OBJ.locked ()) throw EXCEPTION;
 
 # define ACE_WRITE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \
   ACE_Write_Guard< MUTEX > OBJ (LOCK); \
-    if (OBJ.locked () == 0) throw EXCEPTION;
+    if (!OBJ.locked ()) throw EXCEPTION;
 // FUZZ: enable check_for_ACE_Guard
 
 #include /**/ "ace/post.h"
diff --git a/ACE/ace/OS_Memory.h b/ACE/ace/OS_Memory.h
index 01b74f83a70..45558b2f9f2 100644
--- a/ACE/ace/OS_Memory.h
+++ b/ACE/ace/OS_Memory.h
@@ -60,15 +60,6 @@ typedef void * ACE_MALLOC_T;
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-// ============================================================================
-// ACE_NEW macros
-//
-// A useful abstraction for expressions involving operator new since
-// we can change memory allocation error handling policies (e.g.,
-// depending on whether ANSI/ISO exception handling semantics are
-// being used).
-// ============================================================================
-
 // For backwards compatibility, we except all compilers to support these
 #include /**/ <new>
 #define ACE_bad_alloc std::bad_alloc
@@ -77,17 +68,18 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #define ACE_del_bad_alloc
 #define ACE_throw_bad_alloc throw std::bad_alloc ()
 
+// ACE_NEW macros
 #define ACE_NEW_RETURN(POINTER,CONSTRUCTOR,RET_VAL) \
    do { POINTER = new (std::nothrow) CONSTRUCTOR; \
-     if (POINTER == 0) { errno = ENOMEM; return RET_VAL; } \
+     if (!POINTER) { errno = ENOMEM; return RET_VAL; } \
    } while (0)
 #define ACE_NEW(POINTER,CONSTRUCTOR) \
    do { POINTER = new(std::nothrow) CONSTRUCTOR; \
-     if (POINTER == 0) { errno = ENOMEM; return; } \
+     if (!POINTER) { errno = ENOMEM; return; } \
    } while (0)
 #define ACE_NEW_NORETURN(POINTER,CONSTRUCTOR) \
    do { POINTER = new(std::nothrow) CONSTRUCTOR; \
-     if (POINTER == 0) { errno = ENOMEM; } \
+     if (!POINTER) { errno = ENOMEM; } \
    } while (0)
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL