diff options
Diffstat (limited to 'ACE/ACEXML/common/XML_Macros.h')
| -rw-r--r-- | ACE/ACEXML/common/XML_Macros.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/ACE/ACEXML/common/XML_Macros.h b/ACE/ACEXML/common/XML_Macros.h index 3941c0f2e7c..50ec6857b3a 100644 --- a/ACE/ACEXML/common/XML_Macros.h +++ b/ACE/ACEXML/common/XML_Macros.h @@ -32,19 +32,6 @@ #include "ace/Exception_Macros.h" -// The Windows MFC exception mechanism requires that a caught CException -// (including the CMemoryException in use here) be freed using its Delete() -// method. Thus, when MFC is in use and we're catching exceptions as a result -// of new(), the exception's Delete() method has to be called. No other -// platform imposes this sort of restriction/requirement. The Windows -// config stuff (at least for MSVC/MFC) defines a ACE_del_bad_alloc macro -// that works with its ACE_bad_alloc macro to implement this cleanup -// requirement. Since no other platform requires this, define it as -// empty here. -#if !defined (ACE_del_bad_alloc) -# define ACE_del_bad_alloc -#endif - // The following macros assume that an environment variable is passed // in/out of each function that can throw an exception. The type of the // environment variable is defined by ACEXML_ENV_TYPE. @@ -344,7 +331,7 @@ # define ACEXML_NEW_THROW_EX(POINTER,CONSTRUCTOR,EXCEPTION) \ do { try { POINTER = new CONSTRUCTOR; } \ - catch (ACE_bad_alloc) { ACE_del_bad_alloc errno = ENOMEM; ACEXML_THROW_R_INT (EXCEPTION); } \ + catch (ACE_bad_alloc) { errno = ENOMEM; ACEXML_THROW_R_INT (EXCEPTION); } \ } while (0) #else /* ! ACE_NEW_THROWS_EXCEPTIONS */ |