aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanis Johnson <janisjo@codesourcery.com>2012-06-29 03:56:57 +0000
committerJanis Johnson <janis@gcc.gnu.org>2012-06-29 03:56:57 +0000
commit90686faa403ca13d217bf6e8ad15451350780cd7 (patch)
tree32fcfac4db7f7a451136025796afce1f6aa52f43
parentc1827cf0433ac0cdb608f939b2ab7cba724fff5d (diff)
downloadgcc-90686faa403ca13d217bf6e8ad15451350780cd7.zip
gcc-90686faa403ca13d217bf6e8ad15451350780cd7.tar.gz
gcc-90686faa403ca13d217bf6e8ad15451350780cd7.tar.bz2
* g++.dg/cpp0x/nullptr19.c: Remove exta directives on same line.
From-SVN: r189063
-rw-r--r--gcc/testsuite/ChangeLog2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/nullptr19.C4
2 files changed, 4 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6296636..52e5062 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
2012-06-28 Janis Johnson <janisjo@codesourcery.com>
+ * g++.dg/cpp0x/nullptr19.c: Remove exta directives on same line.
+
* g++.dg/template/error46.C: Add missing comment to dg-message.
* g++.dg/template/crash107.C: Likewise.
* g++.dg/template/error47.C: Likewise.
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr19.C b/gcc/testsuite/g++.dg/cpp0x/nullptr19.C
index cf30f1c..ecc3613 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr19.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr19.C
@@ -5,8 +5,8 @@
typedef decltype(nullptr) nullptr_t;
-char* k( char* ); /* { dg-message "note" } { dg-message "note" } */
-nullptr_t k( nullptr_t ); /* { dg-message "note" } { dg-message "note" } */
+char* k( char* ); /* { dg-message "note" } */
+nullptr_t k( nullptr_t ); /* { dg-message "note" } */
void test_k()
{