From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Thu, 13 Sep 2012 22:03:58 +0000 (+0000)
Subject: Fix up after r163846. Sorry!
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5ea91c8c4e64a937ba1f8239faa4ec017d49058;p=clang

Fix up after r163846. Sorry!


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@163849 91177308-0d34-0410-b5e6-96231b3b80d8
---

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'}}
 };