diff options
Diffstat (limited to 'clang/lib/Sema/SemaCXXCast.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaCXXCast.cpp | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/clang/lib/Sema/SemaCXXCast.cpp b/clang/lib/Sema/SemaCXXCast.cpp index ba7e1ff6341..b7b6c3535c5 100644 --- a/clang/lib/Sema/SemaCXXCast.cpp +++ b/clang/lib/Sema/SemaCXXCast.cpp @@ -578,8 +578,9 @@ static TryCastResult TryStaticCast(Sema &Self, Expr *&SrcExpr,            return TC_Success;          }        } -      else if (CStyle && DestType->isObjCObjectPointerType()) { -        // allow c-style cast of objective-c pointers as they are pervasive. +      else if (DestType->isObjCObjectPointerType()) { +        // allow both c-style cast and static_cast of objective-c pointers as  +        // they are pervasive.          Kind = CastExpr::CK_AnyPointerToObjCPointerCast;          return TC_Success;        } | 

