aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2012-09-13 22:03:58 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2012-09-13 22:03:58 +0000
commitb5ea91c8c4e64a937ba1f8239faa4ec017d49058 (patch)
tree4ad2b096818ad93e74c3141ff6973921fe1413df
parentbed51fef5773f043db2ad13aa2b6d2f8a8bdbdba (diff)
Fix up after r163846. Sorry!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@163849 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/CXX/conv/conv.prom/p4.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/CXX/conv/conv.prom/p4.cpp b/test/CXX/conv/conv.prom/p4.cpp
index 26aeee102e..628c19c463 100644
--- a/test/CXX/conv/conv.prom/p4.cpp
+++ b/test/CXX/conv/conv.prom/p4.cpp
@@ -14,13 +14,14 @@ enum B : bool { false_, true_ };
template<bool> struct T {};
T<false_> f;
T<true_> t;
-T<+true_> t; // expected-error {{conversion from 'int' to 'bool'}}
+// FIXME: DR1407 will make this ill-formed for a different reason.
+T<+true_> q; // desired-error {{conversion from 'int' to 'bool'}}
enum B2 : bool {
a = false,
b = true,
c = false_,
d = true_,
- e = +false_ // expected-error {{conversion from 'int' to 'bool'}} \
- // FIXME: expected-error {{enumerator value 2 is not representable}}
+ // FIXME: DR1407 will make this ill-formed
+ e = +false_ // desired-error {{conversion from 'int' to 'bool'}}
};