diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-06-06 18:08:41 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-06-06 18:08:41 +0200 |
| commit | 0dc692d9bb9744d921361e655ad8a7d46c1daf16 (patch) | |
| tree | 1cd37739d264d7e607d9513a6f3431cd7277c201 /ACE/ace/config-win32-msvc.h | |
| parent | a436568e52a5a78afe7b039b4c6b1e089369eba6 (diff) | |
| download | ATCD-0dc692d9bb9744d921361e655ad8a7d46c1daf16.tar.gz | |
Removed ACE_del_bad_alloc, was only used in when std::nothrow wasn't supported which is now supported by all configurations
* ACE/ace/CORBA_macros.h:
* ACE/ace/OS_Memory.h:
* ACE/ace/config-win32-msvc.h:
Diffstat (limited to 'ACE/ace/config-win32-msvc.h')
| -rw-r--r-- | ACE/ace/config-win32-msvc.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h index 5a2dd311e8f..58d44eb8019 100644 --- a/ACE/ace/config-win32-msvc.h +++ b/ACE/ace/config-win32-msvc.h @@ -49,21 +49,6 @@ #endif //FUZZ: enable check_for_msc_ver -// MFC changes the behavior of operator new at all MSVC versions from 6 up -// by throwing a static CMemoryException* instead of std::bad_alloc -// (see ace/OS_Memory.h). This MFC exception object needs to be cleaned up -// by calling its Delete() method. -#if defined (ACE_HAS_MFC) && (ACE_HAS_MFC == 1) -# if defined (ACE_bad_alloc) -# undef ACE_bad_alloc -# endif -# define ACE_bad_alloc CMemoryException *e -# if defined (ACE_del_bad_alloc) -# undef ACE_del_bad_alloc -# endif -# define ACE_del_bad_alloc e->Delete(); -#endif /* ACE_HAS_MFC && ACE_HAS_MFC==1 */ - #if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0) // must have _MT defined to include multithreading // features from win32 headers |