summaryrefslogtreecommitdiff
path: root/gcc/testsuite/g++.old-deja/g++.law
diff options
context:
space:
mode:
authorRichard Sandiford <richard@codesourcery.com>2008-04-09 09:13:23 +0000
committerNathan Sidwell <nathan@gcc.gnu.org>2008-04-09 09:13:23 +0000
commitc6fee2278be28235116e38574cc5078e2d0a7289 (patch)
treeb08e1bf9784d40ea282946b3d1d39753e51ca9a6 /gcc/testsuite/g++.old-deja/g++.law
parent24722ea98e979fd3c7a0e82c8f422544fa5cd947 (diff)
downloadgcc-c6fee2278be28235116e38574cc5078e2d0a7289.tar.gz
target-supports.exp (check_effective_target_vxworks_kernel): Fix comment.
* lib/target-supports.exp (check_effective_target_vxworks_kernel): Fix comment. (check_effective_target_vxworks_rtp): New procedure. * g++.dg/opt/20050511-1.C: Rename UINT32 for VxWorks kernel mode. * g++.dg/warn/miss-format-1.C: XFAIL for VxWorks. * g++.old-deja/g++.abi/cxa_vec.C: XFAIL for VxWorks kernels. * g++.old-deja/g++.brendan/new3.C: Likewise. * g++.old-deja/g++.eh/badalloc1.C: XFAIL for VxWorks RTPs. * g++.old-deja/g++.law/missed-error2.C: Undefine max for VxWorks kernel mode. * g++.old-deja/g++.mike/init1.C: XFAIL for VxWorks kernel mode. * g++.old-deja/g++.mike/p2736.C: Likewise. * g++.old-deja/g++.mike/p658.C: Undefine OK for VxWorks kernel mode. * g++.old-deja/g++.other/headers1.C: Likewise min and max. * g++.old-deja/g++.robertl/eb79.C: Undefine max for VxWorks kernel mode. From-SVN: r134134
Diffstat (limited to 'gcc/testsuite/g++.old-deja/g++.law')
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/missed-error2.C6
1 files changed, 6 insertions, 0 deletions
diff --git a/gcc/testsuite/g++.old-deja/g++.law/missed-error2.C b/gcc/testsuite/g++.old-deja/g++.law/missed-error2.C
index d9d6195dfe8..a26f456f20a 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/missed-error2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/missed-error2.C
@@ -8,6 +8,12 @@
#include <iostream>
+// The VxWorks kernel-mode headers define a macro named "max", which is not
+// ISO-compliant, but is part of the VxWorks API.
+#if defined __vxworks && !defined __RTP__
+#undef max
+#endif
+
inline int max(int a, int b) {return a > b ? a : b;}; // { dg-error "" } candidate
inline double max(double a, double b) {return a > b ? a : b;}; // { dg-error "" } candidate