diff options
| author | John McCall <rjmccall@apple.com> | 2010-08-25 11:45:40 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2010-08-25 11:45:40 +0000 |
| commit | 2de56d1d0c3a504ad1529de2677628bdfbb95cd4 (patch) | |
| tree | 8a74bb48a4267a5f8ef8bff8b8b048c3b30cc50d /lib/Sema/SemaInit.cpp | |
| parent | 0799c53fc2bb7acf937c8a8e165033dba1a5aba3 (diff) | |
GCC didn't care for my attempt at API compatibility, so brute-force everything
to the new constants.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@112047 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaInit.cpp')
| -rw-r--r-- | lib/Sema/SemaInit.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index 57a1874ed4..7b9c25e456 100644 --- a/lib/Sema/SemaInit.cpp +++ b/lib/Sema/SemaInit.cpp @@ -3621,7 +3621,7 @@ InitializationSequence::Perform(Sema &S, VK_RValue); CurInit = S.Owned(ImplicitCastExpr::Create(S.Context, Step->Type, - CastExpr::CK_DerivedToBase, + CK_DerivedToBase, CurInit.get(), &BasePath, VK)); break; @@ -3672,7 +3672,7 @@ InitializationSequence::Perform(Sema &S, case SK_UserConversion: { // We have a user-defined conversion that invokes either a constructor // or a conversion function. - CastExpr::CastKind CastKind = CastExpr::CK_Unknown; + CastKind CastKind = CK_Unknown; bool IsCopy = false; FunctionDecl *Fn = Step->Function.Function; DeclAccessPair FoundFn = Step->Function.FoundDecl; @@ -3703,7 +3703,7 @@ InitializationSequence::Perform(Sema &S, FoundFn.getAccess()); S.DiagnoseUseOfDecl(FoundFn, Kind.getLocation()); - CastKind = CastExpr::CK_ConstructorConversion; + CastKind = CK_ConstructorConversion; QualType Class = S.Context.getTypeDeclType(Constructor->getParent()); if (S.Context.hasSameUnqualifiedType(SourceType, Class) || S.IsDerivedFrom(SourceType, Class)) @@ -3735,7 +3735,7 @@ InitializationSequence::Perform(Sema &S, if (CurInit.isInvalid() || !CurInit.get()) return S.ExprError(); - CastKind = CastExpr::CK_UserDefinedConversion; + CastKind = CK_UserDefinedConversion; CreatedObject = Conversion->getResultType()->isRecordType(); } @@ -3780,7 +3780,7 @@ InitializationSequence::Perform(Sema &S, (Step->Kind == SK_QualificationConversionXValue ? VK_XValue : VK_RValue); - S.ImpCastExprToType(CurInitExpr, Step->Type, CastExpr::CK_NoOp, VK); + S.ImpCastExprToType(CurInitExpr, Step->Type, CK_NoOp, VK); CurInit.release(); CurInit = S.Owned(CurInitExpr); break; @@ -3949,7 +3949,7 @@ InitializationSequence::Perform(Sema &S, case SK_ObjCObjectConversion: S.ImpCastExprToType(CurInitExpr, Step->Type, - CastExpr::CK_ObjCObjectLValueCast, + CK_ObjCObjectLValueCast, S.CastCategory(CurInitExpr)); CurInit.release(); CurInit = S.Owned(CurInitExpr); |