[cfe-commits] r163849 - /cfe/trunk/test/CXX/conv/conv.prom/p4.cpp

[Richard Smith]

Author: rsmith
Date: Thu Sep 13 17:03:58 2012
New Revision: 163849

URL: http://llvm.org/viewvc/llvm-project?rev=163849&view=rev
Log:
Fix up after r163846. Sorry!

Modified:
    cfe/trunk/test/CXX/conv/conv.prom/p4.cpp

Modified: cfe/trunk/test/CXX/conv/conv.prom/p4.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/conv/conv.prom/p4.cpp?rev=163849&r1=163848&r2=163849&view=diff
==============================================================================
--- cfe/trunk/test/CXX/conv/conv.prom/p4.cpp (original)
+++ cfe/trunk/test/CXX/conv/conv.prom/p4.cpp Thu Sep 13 17:03:58 2012
@@ -14,13 +14,14 @@
 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'}}
 };