summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhp <hp@138bc75d-0d04-0410-961f-82ee72b054a4>2008-03-02 13:59:10 +0000
committerhp <hp@138bc75d-0d04-0410-961f-82ee72b054a4>2008-03-02 13:59:10 +0000
commit1ba43cd9540afb5348b3542fd9f4ef5decdcd314 (patch)
treea3c915aa94f4842e1924fcbcf0bf9f6bb90e61e5
parent462a0c319ab4f17b43097f1b491fab27aa757b4d (diff)
downloadgcc-1ba43cd9540afb5348b3542fd9f4ef5decdcd314.tar.gz
* testsuite/20_util/shared_ptr/assign/shared_ptr_neg.cc,
testsuite/tr1/2_general_utilities/shared_ptr/assign/shared_ptr_neg.cc: Mark changed error message prelude, adding "in file included from", using dg-excess-errors. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@132816 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libstdc++-v3/ChangeLog7
-rw-r--r--libstdc++-v3/testsuite/20_util/shared_ptr/assign/shared_ptr_neg.cc4
-rw-r--r--libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/shared_ptr_neg.cc4
3 files changed, 11 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e7a958a355c..00f61e4f5fe 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-02 Hans-Peter Nilsson <hp@axis.com>
+
+ * testsuite/20_util/shared_ptr/assign/shared_ptr_neg.cc,
+ testsuite/tr1/2_general_utilities/shared_ptr/assign/shared_ptr_neg.cc:
+ Mark changed error message prelude, adding "in file included from",
+ using dg-excess-errors.
+
2008-03-01 Jakub Jelinek <jakub@redhat.com>
* config/abi/post/x86_64-linux-gnu/32/baseline_symbols.txt: Update.
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/shared_ptr_neg.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/shared_ptr_neg.cc
index ab272d8c62f..87342529f94 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/shared_ptr_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/shared_ptr_neg.cc
@@ -1,7 +1,7 @@
// { dg-options "-std=gnu++0x" }
// { dg-do compile }
-// Copyright (C) 2005, 2006, 2007 Free Software Foundation
+// Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -21,7 +21,7 @@
// 20.6.6.2 Template class shared_ptr [util.smartptr.shared]
-#include <memory>
+#include <memory> // { dg-excess-errors "In file included from" }
#include <testsuite_hooks.h>
struct A { };
diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/shared_ptr_neg.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/shared_ptr_neg.cc
index 407cc5b0bf5..6cb6341358f 100644
--- a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/shared_ptr_neg.cc
+++ b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/shared_ptr_neg.cc
@@ -1,6 +1,6 @@
// { dg-do compile }
-// Copyright (C) 2005 Free Software Foundation
+// Copyright (C) 2005, 2008 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -20,7 +20,7 @@
// TR1 2.2.2 Template class shared_ptr [tr.util.smartptr.shared]
-#include <tr1/memory>
+#include <tr1/memory> // { dg-excess-errors "In file included from" }
#include <testsuite_hooks.h>
struct A { };