diff options
| author | Benjamin Kosnik <bkoz@fillmore.constant.com> | 2001-06-09 17:55:10 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2001-06-09 17:55:10 +0000 |
| commit | f71c65420c128b6a6323094c0cbcab6a720dfa96 (patch) | |
| tree | 91ec8d2e75d914281f3ab8a6cb86fef4444a1460 /gcc | |
| parent | b27820143dba68c5db8509fbd365370c2ad7e373 (diff) | |
| download | gcc-f71c65420c128b6a6323094c0cbcab6a720dfa96.tar.gz | |
unwind-pe.h: Conditionally qualify references to abort with std::.
2001-06-09 Benjamin Kosnik <bkoz@fillmore.constant.com>
* unwind-pe.h: Conditionally qualify references to abort with
std::.
From-SVN: r43082
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/unwind-pe.h | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5f1add4da72..f8a1e0c4d2a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2001-06-08 Benjamin Kosnik <bkoz@fillmore.constant.com> + + * unwind-pe.h: Conditionally qualify references to abort with + std::. + 2001-06-09 Julian Foad <julian_foad@hotmail.com> * doc/invoke.texi: Remove superfluous text. diff --git a/gcc/unwind-pe.h b/gcc/unwind-pe.h index e952b7f83e4..d6f368f779c 100644 --- a/gcc/unwind-pe.h +++ b/gcc/unwind-pe.h @@ -22,6 +22,13 @@ compatibility problems with the base ABI. This is slightly better than duplicating code, however. */ +/* If using C++, references to abort have to be qualified with std::. */ +#if __cplusplus +#define __gxx_abort std::abort +#else +#define __gxx_abort abort +#endif + /* Pointer encodings, from dwarf2.h. */ #define DW_EH_PE_absptr 0x00 #define DW_EH_PE_omit 0xff @@ -66,7 +73,7 @@ size_of_encoded_value (unsigned char encoding) case DW_EH_PE_udata8: return 8; } - abort (); + __gxx_abort (); } /* Given an encoding and an _Unwind_Context, return the base to which @@ -94,7 +101,7 @@ base_of_encoded_value (unsigned char encoding, struct _Unwind_Context *context) case DW_EH_PE_funcrel: return _Unwind_GetRegionStart (context); } - abort (); + __gxx_abort (); } /* Load an encoded value from memory at P. The value is returned in VAL; @@ -197,7 +204,7 @@ read_encoded_value_with_base (unsigned char encoding, _Unwind_Ptr base, break; default: - abort (); + __gxx_abort (); } if (result != 0) |