diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-11 15:09:29 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-11 15:09:29 +0000 |
| commit | 51f1a0945aae79b4d7389b77e01b6f054864bcf9 (patch) | |
| tree | 769ab53039a5353ce094226e2c4575b7868e0f16 /ace/Future.cpp | |
| parent | ccfec5b680a6af3f6a03530ee6c5fe2d6a3309ec (diff) | |
| download | ATCD-51f1a0945aae79b4d7389b77e01b6f054864bcf9.tar.gz | |
ChangeLogTag:Wed Aug 11 10:07:36 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'ace/Future.cpp')
| -rw-r--r-- | ace/Future.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ace/Future.cpp b/ace/Future.cpp index c38c9af1efc..c6ef59cc0fa 100644 --- a/ace/Future.cpp +++ b/ace/Future.cpp @@ -407,7 +407,12 @@ ACE_Future<T>::get_rep () template <class T> void * ACE_Future<T>::operator new (size_t) { - return 0; +#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 */ } template <class T> void |