diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-09-13 19:55:13 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-09-13 19:55:13 +0000 |
| commit | ceb07622bacde3184b19caf0957f5eeba5cb6784 (patch) | |
| tree | 80ca7bea52be930b9315fb774d3fe65bf84d1d6c /test/CXX/expr | |
| parent | 45b76bad757d8b9f93df2b21ca012c309810d206 (diff) | |
Remove speculative fix for C++ core issue 1407, since it was resolved as NAD.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@163829 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/CXX/expr')
| -rw-r--r-- | test/CXX/expr/expr.const/p3-0x.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/CXX/expr/expr.const/p3-0x.cpp b/test/CXX/expr/expr.const/p3-0x.cpp index 6ddd11bcee..dca20c90c2 100644 --- a/test/CXX/expr/expr.const/p3-0x.cpp +++ b/test/CXX/expr/expr.const/p3-0x.cpp @@ -73,12 +73,13 @@ using Int = A<1000>; // expected-error {{template argument evaluates to 1000, wh using Int = A<-3>; // expected-error {{template argument evaluates to -3, which cannot be narrowed to type 'unsigned char'}} // Note, conversions from integral or unscoped enumeration types to bool are -// integral conversions as well as boolean conversions. +// boolean conversions, not integral conversions, so are not permitted. See +// core issue 1407. template<typename T, T v> struct Val { static constexpr T value = v; }; -static_assert(Val<bool, E1>::value == 1, ""); // ok -static_assert(Val<bool, '\0'>::value == 0, ""); // ok -static_assert(Val<bool, U'\1'>::value == 1, ""); // ok -static_assert(Val<bool, E5>::value == 1, ""); // expected-error {{5, which cannot be narrowed to type 'bool'}} +static_assert(Val<bool, E1>::value == 1, ""); // expected-error {{conversion from 'E' to 'bool' is not allowed in a converted constant expression}} +static_assert(Val<bool, '\0'>::value == 0, ""); // expected-error {{conversion from 'char' to 'bool' is not allowed in a converted constant expression}} +static_assert(Val<bool, U'\1'>::value == 1, ""); // expected-error {{conversion from 'char32_t' to 'bool' is not allowed in a converted constant expression}} +static_assert(Val<bool, E5>::value == 1, ""); // expected-error {{conversion from 'E' to 'bool' is not allowed in a converted constant expression}} // (no other conversions are permitted) using Int = A<1.0>; // expected-error {{conversion from 'double' to 'unsigned char' is not allowed in a converted constant expression}} |