summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaOverload.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2012-09-13 19:55:13 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2012-09-13 19:55:13 +0000
commitb67ada6687e8e727a0171a339925ddd94093e3d0 (patch)
treeaac595feded5da43a2706cec1f1a54c56a4941a9 /clang/lib/Sema/SemaOverload.cpp
parent5371c73cdfcc9bf9322119e2699e54afbe91d23c (diff)
downloadbcm5719-llvm-b67ada6687e8e727a0171a339925ddd94093e3d0.tar.gz
bcm5719-llvm-b67ada6687e8e727a0171a339925ddd94093e3d0.zip
Remove speculative fix for C++ core issue 1407, since it was resolved as NAD.
llvm-svn: 163829
Diffstat (limited to 'clang/lib/Sema/SemaOverload.cpp')
-rw-r--r--clang/lib/Sema/SemaOverload.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index ea0f4b69373..ec64665516c 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/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;
OpenPOWER on IntegriCloud