From: Reid Kleckner Date: Thu, 13 Feb 2020 19:56:50 +0000 (-0800) Subject: Fix MSVC buildbots after ast_type_traits namespace removal X-Git-Tag: llvmorg-12-init~14765 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b2eaa373d12dacf58a72fd9e35ea6159a138647;p=platform%2Fupstream%2Fllvm.git Fix MSVC buildbots after ast_type_traits namespace removal --- diff --git a/clang/include/clang/ASTMatchers/ASTMatchersInternal.h b/clang/include/clang/ASTMatchers/ASTMatchersInternal.h index 90176bc..03eb1f7 100644 --- a/clang/include/clang/ASTMatchers/ASTMatchersInternal.h +++ b/clang/include/clang/ASTMatchers/ASTMatchersInternal.h @@ -282,7 +282,7 @@ public: virtual bool dynMatches(const DynTypedNode &DynNode, ASTMatchFinder *Finder, BoundNodesTreeBuilder *Builder) const = 0; - virtual llvm::Optional TraversalKind() const { + virtual llvm::Optional TraversalKind() const { return llvm::None; } }; @@ -1168,10 +1168,10 @@ struct ArgumentAdaptingMatcherFunc { template class TraversalMatcher : public WrapperMatcherInterface { - TraversalKind Traversal; + clang::TraversalKind Traversal; public: - explicit TraversalMatcher(TraversalKind TK, const Matcher &ChildMatcher) + explicit TraversalMatcher(clang::TraversalKind TK, const Matcher &ChildMatcher) : TraversalMatcher::WrapperMatcherInterface(ChildMatcher), Traversal(TK) { } @@ -1181,7 +1181,7 @@ public: Builder); } - llvm::Optional TraversalKind() const override { + llvm::Optional TraversalKind() const override { return Traversal; } };