From a401fd602dbb3b5953dd6c611296a8b2f013ee5b Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Wed, 9 Jul 2003 21:00:01 +0000 Subject: [PATCH] inclhack.def (math_exception): Improve bypass and comment. * fixinc/inclhack.def (math_exception): Improve bypass and comment. * fixinc/fixincl.x: Rebuild. From-SVN: r69151 --- gcc/ChangeLog | 5 +++++ gcc/fixinc/fixincl.x | 6 +++--- gcc/fixinc/inclhack.def | 5 +++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f70537ef77e..8e3af25b7d7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2003-07-09 Nathanael Nerode + + * fixinc/inclhack.def (math_exception): Improve bypass and comment. + * fixinc/fixincl.x: Rebuild. + 2003-07-09 Hans-Peter Nilsson * doc/install.texi (Configuration): Document the valgrind option diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index b1a426d468e..884f1e81fe5 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Tuesday July 8, 2003 at 01:41:54 PM PDT + * It has been AutoGen-ed Wednesday July 9, 2003 at 04:58:23 PM EDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Tue Jul 8 13:41:54 PDT 2003 +/* DO NOT CVS-MERGE THIS FILE, EITHER Wed Jul 9 16:58:23 EDT 2003 * * You must regenerate it. Use the ./genfixes script. * @@ -3022,7 +3022,7 @@ tSCC zMath_ExceptionSelect0[] = * content bypass pattern - skip fix if pattern found */ tSCC zMath_ExceptionBypass0[] = - "We have a problem when using C\\+\\+"; + "__cplusplus"; #define MATH_EXCEPTION_TEST_CT 2 static tTestDesc aMath_ExceptionTests[] = { diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index f77c5411d14..dda47b9b8d3 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -1680,7 +1680,8 @@ fix = { /* - * Some math.h files define struct exception, which conflicts with + * Some math.h files define struct exception (it's in the System V + * Interface Definition), which conflicts with * the class exception defined in the C++ file std/stdexcept.h. We * redefine it to __math_exception. This is not a great fix, but I * haven't been able to think of anything better. @@ -1692,7 +1693,7 @@ fix = { hackname = math_exception; files = math.h; select = "struct exception"; - bypass = 'We have a problem when using C\+\+'; + bypass = '__cplusplus'; c_fix = wrap; c_fix_arg = "#ifdef __cplusplus\n" -- 2.30.2