From 72f307a26e85109dacc68887807734a1b72ad6a7 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Sat, 28 Mar 2009 04:17:27 +0000 Subject: Revert Sebastian's rvalue patch (r67870) since it caused test failures in SemaCXX//overload-member-call.cpp SemaCXX//overloaded-operator.cpp SemaTemplate//instantiate-method.cpp llvm-svn: 67912 --- clang/lib/Sema/SemaAccess.cpp | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'clang/lib/Sema/SemaAccess.cpp') diff --git a/clang/lib/Sema/SemaAccess.cpp b/clang/lib/Sema/SemaAccess.cpp index e65b0505002..cc212434b79 100644 --- a/clang/lib/Sema/SemaAccess.cpp +++ b/clang/lib/Sema/SemaAccess.cpp @@ -55,7 +55,7 @@ bool Sema::CheckBaseClassAccess(QualType Derived, QualType Base, const CXXBaseSpecifier *InacessibleBase = 0; - CXXRecordDecl* CurrentClassDecl = 0; + const CXXRecordDecl* CurrentClassDecl = 0; if (CXXMethodDecl *MD = dyn_cast_or_null(getCurFunctionDecl())) CurrentClassDecl = MD->getParent(); @@ -79,21 +79,9 @@ bool Sema::CheckBaseClassAccess(QualType Derived, QualType Base, if (CurrentClassDecl != Element->Class) FoundInaccessibleBase = true; break; - case AS_protected: - // FIXME: Check if the current function/class is a friend. - if (!CurrentClassDecl) { - FoundInaccessibleBase = true; - break; - } - - if (CurrentClassDecl != Element->Class) { - QualType CurrentClassType = Context.getTypeDeclType(CurrentClassDecl); - QualType ClassType = Context.getTypeDeclType(Element->Class); - - if (!IsDerivedFrom(CurrentClassType, ClassType)) - FoundInaccessibleBase = true; - break; - } + case AS_protected: + // FIXME: Implement + break; } if (FoundInaccessibleBase) { -- cgit v1.2.3