diff options
| author | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-08 20:48:29 +0000 |
|---|---|---|
| committer | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-08 20:48:29 +0000 |
| commit | 6c3ce7313c0846ff8281937f3429a98c2d9fd6da (patch) | |
| tree | 194b778654fe5877c9e53c7ebe679b8376e49fd2 /ace/config-all.h | |
| parent | b3fa89e060888e589682aa8abf52cae6f77f7ae0 (diff) | |
| download | ATCD-6c3ce7313c0846ff8281937f3429a98c2d9fd6da.tar.gz | |
ChangeLogTag: Wed Nov 8 14:40:25 2000 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'ace/config-all.h')
| -rw-r--r-- | ace/config-all.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ace/config-all.h b/ace/config-all.h index fa8ef4c5d7c..90bd9f4d9d7 100644 --- a/ace/config-all.h +++ b/ace/config-all.h @@ -374,7 +374,9 @@ extern int t_errno; // introduces other stuff that breaks things, like <memory>, which // screws up auto_ptr. # include /**/ <new> -# if (defined (__HP_aCC) && !defined (RWSTD_NO_NAMESPACE)) \ +# if ((defined (__HP_aCC) && \ + (__HP_aCC < 32500 && !defined (RWSTD_NO_NAMESPACE)) || \ + (__HP_aCC >= 32500 && defined (_NAMESPACE_STD)))) \ || defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) # define ACE_bad_alloc std::bad_alloc # else |