diff options
| author | Steve Huston <shuston@riverace.com> | 2000-12-22 19:05:19 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2000-12-22 19:05:19 +0000 |
| commit | 2dd3d5a92face12cb2f12076d060282c8d596fef (patch) | |
| tree | fa96d28cede233eebbb82bb2a96d0d9c377addaa | |
| parent | 7206cdcfe643e0d39537f19e9831fcdbf46fb087 (diff) | |
| download | ATCD-2dd3d5a92face12cb2f12076d060282c8d596fef.tar.gz | |
ChangeLogTag:Fri Dec 22 14:00:41 2000 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ace/config-all.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ace/config-all.h b/ace/config-all.h index c77dab6a096..d123d1f347a 100644 --- a/ace/config-all.h +++ b/ace/config-all.h @@ -364,14 +364,16 @@ // introduces other stuff that breaks things, like <memory>, which // screws up auto_ptr. # include /**/ <new> -# if ((defined (__HP_aCC) && \ - (__HP_aCC < 32500 && !defined (RWSTD_NO_NAMESPACE)) || \ - (__HP_aCC >= 32500 && defined (_NAMESPACE_STD)))) \ + // _HP_aCC was first defined at aC++ 03.13 on HP-UX 11. Prior to that + // (03.10 and before) a failed new threw bad_alloc. After that (03.13 + // and above) the exception thrown is dependent on the below settings. +# if (defined (__HP_aCC) && \ + (!defined (RWSTD_NO_NAMESPACE) || defined (_NAMESPACE_STD))) \ || defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) # define ACE_bad_alloc std::bad_alloc # else # define ACE_bad_alloc bad_alloc -# endif /* RWSTD_NO_NAMESPACE */ +# endif /* __HP_aCC */ # define ACE_throw_bad_alloc throw ACE_bad_alloc () # endif /* __SUNPRO_CC */ |