diff options
author | Jason Merrill <jason@redhat.com> | 2010-11-01 23:29:52 -0400 |
---|---|---|
committer | Jason Merrill <jason@redhat.com> | 2010-11-01 23:32:03 -0400 |
commit | d29b209e37cb85fdf1cb1d8e0ae263cc3c59312b (patch) | |
tree | 0e6b797a6c1a23c50603805706926a5eaa2184f1 /gcc/testsuite/g++.dg/cpp0x/constexpr-throw.C | |
parent | 2450a78a38a727e7ec673b132315c8379db3b27d (diff) | |
parent | c0000147b2aef6b69e2c6b6d29a9963910f6da98 (diff) | |
download | gcc-constexpr.tar.gz |
Merge remote branch 'trunk' into constexprconstexpr
Diffstat (limited to 'gcc/testsuite/g++.dg/cpp0x/constexpr-throw.C')
-rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/constexpr-throw.C | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-throw.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-throw.C index 345b24097b1..f1ef9dc7d0d 100644 --- a/gcc/testsuite/g++.dg/cpp0x/constexpr-throw.C +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-throw.C @@ -4,5 +4,5 @@ constexpr int may_throw(bool decide) { return decide ? 42 : throw -1; // { dg-error "throw" } } -constexpr int x = may_throw(false); // { dg-error "may_throw" } +constexpr int x = may_throw(false); // { dg-message "may_throw" } constexpr int y = may_throw(true); |