diff options
Diffstat (limited to 'ACE/ace/OS_Memory.h')
| -rw-r--r-- | ACE/ace/OS_Memory.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ACE/ace/OS_Memory.h b/ACE/ace/OS_Memory.h index 186384f76f5..ad5a22dbad2 100644 --- a/ACE/ace/OS_Memory.h +++ b/ACE/ace/OS_Memory.h @@ -58,11 +58,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_HAS_OLD_MALLOC) -typedef char * ACE_MALLOC_T; -#else typedef void * ACE_MALLOC_T; -#endif /* ACE_HAS_OLD_MALLOC */ ACE_END_VERSIONED_NAMESPACE_DECL @@ -238,7 +234,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 0 # endif #endif /* ACE_NEW_THROWS_EXCEPTIONS */ |