*** empty log message ***

1 files changed, 0 insertions, 34 deletions

diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h
index 863a31bcbb7..1f0926741b2 100644
--- a/ace/Malloc_T.h
+++ b/ace/Malloc_T.h
@@ -17,40 +17,6 @@
 #if !defined (ACE_MALLOC_T_H)
 #define ACE_MALLOC_T_H
 
-// Some useful abstration for expressions involving
-// ACE_Allocator.malloc ().  The difference between ACE_NEW_MALLOC*
-// with ACE_ALLOCATOR* is that they call constructors also.
-
-#define ACE_ALLOCATOR_RETURN(POINTER,ALLOCATOR,RET_VAL) \
-   do { POINTER = ALLOCATOR; \
-     if (POINTER == 0) { errno = ENOMEM; return RET_VAL; } \
-   } while (0)
-#define ACE_ALLOCATOR(POINTER,ALLOCATOR) \
-   do { POINTER = ALLOCATOR; \
-     if (POINTER == 0) { errno = ENOMEM; return; } \
-   } while (0)
-
-#define ACE_NEW_MALLOC_RETURN(POINTER,ALLOCATOR,CONSTRUCTOR,RET_VAL) \
-   do { POINTER = ALLOCATOR; \
-     if (POINTER == 0) { errno = ENOMEM; return RET_VAL;} \
-     else { new (POINTER) CONSTRUCTOR; } \
-   } while (0)
-#define ACE_NEW_MALLOC(POINTER,ALLOCATOR,CONSTRUCTOR) \
-   do { POINTER = ALLOCATOR; \
-     if (POINTER == 0) { errno = ENOMEM; return;} \
-     else { new (POINTER) CONSTRUCTOR; } \
-   } while (0)
-
-#define ACE_DES_NOFREE (POINTER,CLASS) POINTER->CLASS::~CLASS ()
-#define ACE_DES_FREE(POINTER,DEALLOCATOR,CLASS) \
-   do { POINTER->CLASS::~CLASS (); DEALLOCATOR (POINTER); } while (0)
-#define ACE_DES_NOFREE_TEMPLATE (POINTER,T_CLASS,T_PARAMETER) \
-     POINTER-> T_CLASS T_PARAMETER ::~ T_CLASS ()
-#define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER) \
-   do { POINTER-> T_CLASS T_PARAMETER ::~ T_CLASS (); \
-        DEALLOCATOR (POINTER); \
-      } while (0)
-
 #include "ace/ACE.h"
 #include "ace/Synch.h"
 #include "ace/Malloc.h"