diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2009-07-29 02:32:23 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2009-07-29 02:32:23 +0000 |
| commit | 5eac10b620678b5ddbe04a0455880d6bcbd81bc9 (patch) | |
| tree | fd4ac269e9f354efee21ae0923450d02a34241e5 | |
| parent | 93f4e31b12835cc71715a460236c1d4cee8aaf9b (diff) | |
| download | ATCD-5eac10b620678b5ddbe04a0455880d6bcbd81bc9.tar.gz | |
ChangeLogTag:Tue
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/ace/OS_Memory.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index c6e234f0a8d..f8448d3981c 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Tue Jul 28 18:13:22 UTC 2009 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/OS_Memory.h: Replace the ACE_throw_bad_alloc macro + definition with return (void*) 0 if exceptions=0 is enabled. + Thanks to John Lindal <lindalj at yahoo-inc dot com> for this + fix. + Tue Jul 28 21:29:35 UTC 2009 Steve Huston <shuston@riverace.com> * tests/Service_Config_Stream_Test.cpp: diff --git a/ACE/ace/OS_Memory.h b/ACE/ace/OS_Memory.h index 186384f76f5..6d5e23e438a 100644 --- a/ACE/ace/OS_Memory.h +++ b/ACE/ace/OS_Memory.h @@ -238,7 +238,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # if defined (ACE_HAS_MFC) && (ACE_HAS_MFC == 1) # define ACE_throw_bad_alloc AfxThrowMemoryException () # else -# define ACE_throw_bad_alloc throw ACE_bad_alloc () +# define ACE_throw_bad_alloc return (void*) 0 # endif #endif /* ACE_NEW_THROWS_EXCEPTIONS */ |