diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-12 16:45:07 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-12 16:45:07 +0000 |
| commit | fbb760b09c487034ea82cb6e67717835ea06c301 (patch) | |
| tree | 40b8ca0198322803c53263354aeb810419a38032 /ace/Future.cpp | |
| parent | fe10ccd7978e5f7202b4aa91726c513916bed644 (diff) | |
| download | ATCD-fbb760b09c487034ea82cb6e67717835ea06c301.tar.gz | |
ChangeLogTag:Thu Aug 12 11:36:46 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'ace/Future.cpp')
| -rw-r--r-- | ace/Future.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ace/Future.cpp b/ace/Future.cpp index 46d1fe8edc8..1932a55bce0 100644 --- a/ace/Future.cpp +++ b/ace/Future.cpp @@ -407,12 +407,7 @@ ACE_Future<T>::get_rep () template <class T> void * ACE_Future<T>::operator new (size_t) { -#if defined(ACE_NEW_THROWS_EXCEPTIONS) && defined(ACE_HAS_EXCEPTIONS) - throw ACE_bad_alloc (); -#else - void* gcc_will_complain_if_literal_0_is_returned = 0; - return gcc_will_complain_if_literal_0_is_returned; -#endif /* ACE_NEW_THROWS_EXCEPTIONS && ACE_HAS_EXCEPTIONS */ + ACE_throw_bad_alloc; } template <class T> void |