diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Sema/SemaOverload.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp index 9bba5f6c78..16fd28e461 100644 --- a/lib/Sema/SemaOverload.cpp +++ b/lib/Sema/SemaOverload.cpp @@ -1667,11 +1667,7 @@ static bool IsStandardConversion(Sema &S, Expr* From, QualType ToType, CanonTo = S.Context.getCanonicalType(ToType); if (CanonFrom.getLocalUnqualifiedType() == CanonTo.getLocalUnqualifiedType() && - (CanonFrom.getLocalCVRQualifiers() != CanonTo.getLocalCVRQualifiers() - || CanonFrom.getObjCGCAttr() != CanonTo.getObjCGCAttr() - || CanonFrom.getObjCLifetime() != CanonTo.getObjCLifetime() - || (CanonFrom->isSamplerT() && - CanonFrom.getAddressSpace() != CanonTo.getAddressSpace()))) { + CanonFrom.getLocalQualifiers() != CanonTo.getLocalQualifiers()) { FromType = ToType; CanonFrom = CanonTo; } |