diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-08-08 09:18:21 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-08-08 09:18:21 +0000 |
| commit | f66674cb0ace3bdba0bd4875646c50f706e6ad32 (patch) | |
| tree | 7008261e235cf74eed46864d225ce2c9a586c27d /ACE/ace/config-win32-msvc.h | |
| parent | b10f003ddd69d409b5a10a57e491b22ded1c440f (diff) | |
| download | ATCD-f66674cb0ace3bdba0bd4875646c50f706e6ad32.tar.gz | |
Tue Aug 8 09:15:00 UTC 2006 Simon Massey <sma@prismtech.com>
Diffstat (limited to 'ACE/ace/config-win32-msvc.h')
| -rw-r--r-- | ACE/ace/config-win32-msvc.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h index 77bcedec66f..3934406683a 100644 --- a/ACE/ace/config-win32-msvc.h +++ b/ACE/ace/config-win32-msvc.h @@ -73,15 +73,12 @@ # error This version of Microsoft Visual C++ is not supported. #endif -// MFC changes the behavior of operator new at all MSVC versions from 6 up. +// MFC changes the behavior of operator new at all MSVC versions from 6 up, +// see ace/OS_Memory.h (throws a static CMemoryException* instead of std::bad_alloc) #if defined (ACE_HAS_MFC) && (ACE_HAS_MFC == 1) # if !defined (ACE_NEW_THROWS_EXCEPTIONS) # define ACE_NEW_THROWS_EXCEPTIONS # endif -# if defined (ACE_bad_alloc) -# undef ACE_bad_alloc -# endif -# define ACE_bad_alloc CMemoryException #endif /* ACE_HAS_MFC && ACE_HAS_MFC==1 */ #if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0) |