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 /lib/Sema/SemaOverload.cpp | |
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 'lib/Sema/SemaOverload.cpp')
-rw-r--r-- | lib/Sema/SemaOverload.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp index ea0f4b6937..ec64665516 100644 --- a/lib/Sema/SemaOverload.cpp +++ b/lib/Sema/SemaOverload.cpp @@ -4798,12 +4798,6 @@ static bool CheckConvertedConstantConversions(Sema &S, return true; case ICK_Boolean_Conversion: - // Conversion from an integral or unscoped enumeration type to bool is - // classified as ICK_Boolean_Conversion, but it's also an integral - // conversion, so it's permitted in a converted constant expression. - return SCS.getFromType()->isIntegralOrUnscopedEnumerationType() && - SCS.getToType(2)->isBooleanType(); - case ICK_Floating_Integral: case ICK_Complex_Real: return false; |