summaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2011-11-21 02:04:38 +0000
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2011-11-21 02:04:38 +0000
commit4efa73458103c7db5d4187a707cd7134e3a2972c (patch)
tree04c08061e821d1749a3b70b3445de464514be794 /libstdc++-v3
parent4fcdf6aea6a717afe69c62bdea3c3e472e1887b7 (diff)
downloadgcc-4efa73458103c7db5d4187a707cd7134e3a2972c.tar.gz
* pt.c (type_unification_real): Set input_location
during default arg instantiation. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181546 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/testsuite/20_util/bind/ref_neg.cc8
2 files changed, 10 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5515c0778d2..282e95b1fa3 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-20 Jason Merrill <jason@redhat.com>
+
+ * testsuite/20_util/bind/ref_neg.cc: Adjust error markings.
+
2011-11-20 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/backward/binders.h: Fix examples in doxygen comments and
diff --git a/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc b/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc
index f5a08c2630a..d2441a39ecb 100644
--- a/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc
@@ -29,8 +29,12 @@ int inc(int& i) { return ++i; }
void test01()
{
const int dummy = 0;
- std::bind(&inc, _1)(0); // { dg-error "no match|rvalue" }
- std::bind(&inc, std::ref(dummy))(); // { dg-error "no match|const" }
+ std::bind(&inc, _1)(0); // { dg-error "no match" }
+ // { dg-error "rvalue|const" "" { target *-*-* } 1199 }
+ // { dg-error "rvalue|const" "" { target *-*-* } 1212 }
+ // { dg-error "rvalue|const" "" { target *-*-* } 1226 }
+ // { dg-error "rvalue|const" "" { target *-*-* } 1240 }
+ std::bind(&inc, std::ref(dummy))(); // { dg-error "no match" }
}
struct Inc