2001-06-09 Benjamin Kosnik <bkoz@fillmore.constant.com>

	* unwind-pe.h: Conditionally qualify references to abort with
	std::.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@43082 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5f1add4..f8a1e0c 100644 (file)
--- 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 e952b7f..d6f368f 100644 (file)
--- 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)