diff options
Diffstat (limited to 'clang/lib/ASTMatchers/Dynamic')
| -rw-r--r-- | clang/lib/ASTMatchers/Dynamic/Marshallers.h | 10 | ||||
| -rw-r--r-- | clang/lib/ASTMatchers/Dynamic/Registry.cpp | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/clang/lib/ASTMatchers/Dynamic/Marshallers.h b/clang/lib/ASTMatchers/Dynamic/Marshallers.h index 439d3d5a3a8..6e144cd26ed 100644 --- a/clang/lib/ASTMatchers/Dynamic/Marshallers.h +++ b/clang/lib/ASTMatchers/Dynamic/Marshallers.h @@ -158,10 +158,10 @@ public: }; inline bool isRetKindConvertibleTo( - llvm::ArrayRef<ast_type_traits::ASTNodeKind> RetKinds, + ArrayRef<ast_type_traits::ASTNodeKind> RetKinds, ast_type_traits::ASTNodeKind Kind, unsigned *Specificity, ast_type_traits::ASTNodeKind *LeastDerivedKind) { - for (llvm::ArrayRef<ast_type_traits::ASTNodeKind>::const_iterator + for (ArrayRef<ast_type_traits::ASTNodeKind>::const_iterator i = RetKinds.begin(), e = RetKinds.end(); i != e; ++i) { @@ -199,8 +199,8 @@ public: /// \param ArgKinds The types of the arguments this matcher takes. FixedArgCountMatcherDescriptor( MarshallerType Marshaller, void (*Func)(), StringRef MatcherName, - llvm::ArrayRef<ast_type_traits::ASTNodeKind> RetKinds, - llvm::ArrayRef<ArgKind> ArgKinds) + ArrayRef<ast_type_traits::ASTNodeKind> RetKinds, + ArrayRef<ArgKind> ArgKinds) : Marshaller(Marshaller), Func(Func), MatcherName(MatcherName), RetKinds(RetKinds.begin(), RetKinds.end()), ArgKinds(ArgKinds.begin(), ArgKinds.end()) {} @@ -646,7 +646,7 @@ MatcherDescriptor *makeMatcherAutoMarshall(ReturnType (*Func)(), BuildReturnTypeVector<ReturnType>::build(RetTypes); return new FixedArgCountMatcherDescriptor( matcherMarshall0<ReturnType>, reinterpret_cast<void (*)()>(Func), - MatcherName, RetTypes, llvm::ArrayRef<ArgKind>()); + MatcherName, RetTypes, None); } /// \brief 1-arg overload diff --git a/clang/lib/ASTMatchers/Dynamic/Registry.cpp b/clang/lib/ASTMatchers/Dynamic/Registry.cpp index cea5039526c..4bc50a0f2a9 100644 --- a/clang/lib/ASTMatchers/Dynamic/Registry.cpp +++ b/clang/lib/ASTMatchers/Dynamic/Registry.cpp @@ -363,7 +363,7 @@ struct ReverseSpecificityThenName { } std::vector<MatcherCompletion> Registry::getCompletions( - llvm::ArrayRef<std::pair<MatcherCtor, unsigned> > Context) { + ArrayRef<std::pair<MatcherCtor, unsigned> > Context) { ASTNodeKind InitialTypes[] = { ASTNodeKind::getFromNodeKind<Decl>(), ASTNodeKind::getFromNodeKind<QualType>(), @@ -373,12 +373,12 @@ std::vector<MatcherCompletion> Registry::getCompletions( ASTNodeKind::getFromNodeKind<NestedNameSpecifierLoc>(), ASTNodeKind::getFromNodeKind<TypeLoc>() }; - llvm::ArrayRef<ASTNodeKind> InitialTypesRef(InitialTypes); + ArrayRef<ASTNodeKind> InitialTypesRef(InitialTypes); // Starting with the above seed of acceptable top-level matcher types, compute // the acceptable type set for the argument indicated by each context element. std::set<ASTNodeKind> TypeSet(InitialTypesRef.begin(), InitialTypesRef.end()); - for (llvm::ArrayRef<std::pair<MatcherCtor, unsigned> >::iterator + for (ArrayRef<std::pair<MatcherCtor, unsigned> >::iterator CtxI = Context.begin(), CtxE = Context.end(); CtxI != CtxE; ++CtxI) { |
