Commit a401fd60 by Nathanael Nerode

inclhack.def (math_exception): Improve bypass and comment.

	* fixinc/inclhack.def (math_exception):  Improve bypass and comment.
	* fixinc/fixincl.x: Rebuild.

From-SVN: r69151
parent ca1c7011
2003-07-09 Nathanael Nerode <neroden@gcc.gnu.org>
* fixinc/inclhack.def (math_exception): Improve bypass and comment.
* fixinc/fixincl.x: Rebuild.
2003-07-09 Hans-Peter Nilsson <hp@bitrange.com> 2003-07-09 Hans-Peter Nilsson <hp@bitrange.com>
* doc/install.texi (Configuration): Document the valgrind option * doc/install.texi (Configuration): Document the valgrind option
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
* *
* DO NOT EDIT THIS FILE (fixincl.x) * 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 * From the definitions inclhack.def
* and the template file fixincl * 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. * You must regenerate it. Use the ./genfixes script.
* *
...@@ -3022,7 +3022,7 @@ tSCC zMath_ExceptionSelect0[] = ...@@ -3022,7 +3022,7 @@ tSCC zMath_ExceptionSelect0[] =
* content bypass pattern - skip fix if pattern found * content bypass pattern - skip fix if pattern found
*/ */
tSCC zMath_ExceptionBypass0[] = tSCC zMath_ExceptionBypass0[] =
"We have a problem when using C\\+\\+"; "__cplusplus";
#define MATH_EXCEPTION_TEST_CT 2 #define MATH_EXCEPTION_TEST_CT 2
static tTestDesc aMath_ExceptionTests[] = { static tTestDesc aMath_ExceptionTests[] = {
......
...@@ -1680,7 +1680,8 @@ fix = { ...@@ -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 * 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 * redefine it to __math_exception. This is not a great fix, but I
* haven't been able to think of anything better. * haven't been able to think of anything better.
...@@ -1692,7 +1693,7 @@ fix = { ...@@ -1692,7 +1693,7 @@ fix = {
hackname = math_exception; hackname = math_exception;
files = math.h; files = math.h;
select = "struct exception"; select = "struct exception";
bypass = 'We have a problem when using C\+\+'; bypass = '__cplusplus';
c_fix = wrap; c_fix = wrap;
c_fix_arg = "#ifdef __cplusplus\n" c_fix_arg = "#ifdef __cplusplus\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment