aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAldy Hernandez <aldyh@redhat.com>2009-06-17 12:59:39 +0000
committerAldy Hernandez <aldyh@gcc.gnu.org>2009-06-17 12:59:39 +0000
commit6958c7802c3e7e62f3f56a0b0319beed6879d7e8 (patch)
treeefd077872360d18622c4b85e1f4b8c002eb25a79
parent2f4d1994d0aee81eb9b6234db264d89d2b7f911a (diff)
downloadgcc-6958c7802c3e7e62f3f56a0b0319beed6879d7e8.zip
gcc-6958c7802c3e7e62f3f56a0b0319beed6879d7e8.tar.gz
gcc-6958c7802c3e7e62f3f56a0b0319beed6879d7e8.tar.bz2
* gcc.dg/func-ptr-conv-1.c: Update column info.
From-SVN: r148609
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gcc.dg/func-ptr-conv-1.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d70b5ca..42ec514 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-17 Aldy Hernandez <aldyh@redhat.com>
+
+ * gcc.dg/func-ptr-conv-1.c: Update column info.
+
2009-06-17 Richard Guenther <rguenther@suse.de>
PR middle-end/40404
diff --git a/gcc/testsuite/gcc.dg/func-ptr-conv-1.c b/gcc/testsuite/gcc.dg/func-ptr-conv-1.c
index c331fbc..5c8a101 100644
--- a/gcc/testsuite/gcc.dg/func-ptr-conv-1.c
+++ b/gcc/testsuite/gcc.dg/func-ptr-conv-1.c
@@ -37,8 +37,8 @@ g(void)
fp = c5; /* { dg-warning "6:pointer" "bad conversion" } */
fp = (void (*)(void))v5; /* { dg-warning "8:pointer" "bad conversion" } */
fp = (void (*)(void))c5; /* { dg-warning "8:pointer" "bad conversion" } */
- (a ? f : v3); /* { dg-warning "6:pointer" "bad conversion" } */
- (a ? v2 : fp); /* { dg-warning "6:pointer" "bad conversion" } */
+ (a ? f : v3); /* { dg-warning "10:pointer" "bad conversion" } */
+ (a ? v2 : fp); /* { dg-warning "11:pointer" "bad conversion" } */
/* The following are OK. */
fp = 0;
fp = (void *)0;