diff options
Diffstat (limited to 'lib/Sema/Sema.h')
| -rw-r--r-- | lib/Sema/Sema.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h index 7354d7cf94..9ddabde869 100644 --- a/lib/Sema/Sema.h +++ b/lib/Sema/Sema.h @@ -90,8 +90,7 @@ namespace clang { class ObjCPropertyDecl; class ObjCContainerDecl; class FunctionProtoType; - class BasePaths; - struct MemberLookupCriteria; + class CXXBasePaths; class CXXTemporary; /// BlockSemaInfo - When a block is being parsed, this contains information @@ -1066,7 +1065,7 @@ public: /// pointers used to reconstruct DeclContext::lookup_iterators. OverloadedDeclFromDeclContext, - /// First is a pointer to a BasePaths structure, which is owned + /// First is a pointer to a CXXBasePaths structure, which is owned /// by the LookupResult. Last is non-zero to indicate that the /// ambiguity is caused by two names found in base class /// subobjects of different types. @@ -1085,7 +1084,7 @@ public: /// IdentifierResolver::iterator (if StoredKind == /// OverloadedDeclFromIdResolver), a DeclContext::lookup_iterator /// (if StoredKind == OverloadedDeclFromDeclContext), or a - /// BasePaths pointer (if StoredKind == AmbiguousLookupStoresBasePaths). + /// CXXBasePaths pointer (if StoredKind == AmbiguousLookupStoresBasePaths). mutable uintptr_t First; /// The last lookup result, whose contents depend on the kind of @@ -1168,7 +1167,8 @@ public: DeclContext::lookup_iterator F, DeclContext::lookup_iterator L); - static LookupResult CreateLookupResult(ASTContext &Context, BasePaths *Paths, + static LookupResult CreateLookupResult(ASTContext &Context, + CXXBasePaths *Paths, bool DifferentSubobjectTypes) { LookupResult Result; Result.StoredKind = AmbiguousLookupStoresBasePaths; @@ -1209,7 +1209,7 @@ public: NamedDecl* getAsDecl() const; - BasePaths *getBasePaths() const; + CXXBasePaths *getBasePaths() const; /// \brief Iterate over the results of name lookup. /// @@ -2316,9 +2316,8 @@ public: unsigned NumBases); bool IsDerivedFrom(QualType Derived, QualType Base); - bool IsDerivedFrom(QualType Derived, QualType Base, BasePaths &Paths); - bool LookupInBases(CXXRecordDecl *Class, const MemberLookupCriteria& Criteria, - BasePaths &Paths); + bool IsDerivedFrom(QualType Derived, QualType Base, CXXBasePaths &Paths); + bool CheckDerivedToBaseConversion(QualType Derived, QualType Base, SourceLocation Loc, SourceRange Range); bool CheckDerivedToBaseConversion(QualType Derived, QualType Base, @@ -2327,7 +2326,7 @@ public: SourceLocation Loc, SourceRange Range, DeclarationName Name); - std::string getAmbiguousPathsDisplayString(BasePaths &Paths); + std::string getAmbiguousPathsDisplayString(CXXBasePaths &Paths); /// CheckOverridingFunctionReturnType - Checks whether the return types are /// covariant, according to C++ [class.virtual]p5. @@ -2348,12 +2347,12 @@ public: AccessSpecifier LexicalAS); const CXXBaseSpecifier *FindInaccessibleBase(QualType Derived, QualType Base, - BasePaths &Paths, + CXXBasePaths &Paths, bool NoPrivileges = false); bool CheckBaseClassAccess(QualType Derived, QualType Base, unsigned InaccessibleBaseID, - BasePaths& Paths, SourceLocation AccessLoc, + CXXBasePaths& Paths, SourceLocation AccessLoc, DeclarationName Name); |