commit 2de56d1d0c3a504ad1529de2677628bdfbb95cd4
author John McCall <rjmccall@apple.com> Wed Aug 25 11:45:40 2010 +0000
committer John McCall <rjmccall@apple.com> Wed Aug 25 11:45:40 2010 +0000
tree 8a74bb48a4267a5f8ef8bff8b8b048c3b30cc50d
parent 0799c53fc2bb7acf937c8a8e165033dba1a5aba3

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

lib/CodeGen/ItaniumCXXABI.cpp

diff --git a/lib/CodeGen/ItaniumCXXABI.cpp b/lib/CodeGen/ItaniumCXXABI.cpp
index 5e1bb25..354e72f 100644
--- a/lib/CodeGen/ItaniumCXXABI.cpp
+++ b/lib/CodeGen/ItaniumCXXABI.cpp
@@ -241,8 +241,8 @@
 ItaniumCXXABI::EmitMemberPointerConversion(CodeGenFunction &CGF,
                                            const CastExpr *E,
                                            llvm::Value *Src) {
-  assert(E->getCastKind() == CastExpr::CK_DerivedToBaseMemberPointer ||
-         E->getCastKind() == CastExpr::CK_BaseToDerivedMemberPointer);
+  assert(E->getCastKind() == CK_DerivedToBaseMemberPointer ||
+         E->getCastKind() == CK_BaseToDerivedMemberPointer);
 
   if (isa<llvm::Constant>(Src))
     return EmitMemberPointerConversion(cast<llvm::Constant>(Src), E);
@@ -257,7 +257,7 @@
   const CXXRecordDecl *DestDecl = DestTy->getClass()->getAsCXXRecordDecl();
 
   bool DerivedToBase =
-    E->getCastKind() == CastExpr::CK_DerivedToBaseMemberPointer;
+    E->getCastKind() == CK_DerivedToBaseMemberPointer;
 
   const CXXRecordDecl *BaseDecl, *DerivedDecl;
   if (DerivedToBase)
@@ -312,7 +312,7 @@
     E->getType()->getAs<MemberPointerType>();
 
   bool DerivedToBase =
-    E->getCastKind() == CastExpr::CK_DerivedToBaseMemberPointer;
+    E->getCastKind() == CK_DerivedToBaseMemberPointer;
 
   const CXXRecordDecl *DerivedDecl;
   if (DerivedToBase)