diff options
Diffstat (limited to 'clang/lib/ASTMatchers/ASTMatchFinder.cpp')
| -rw-r--r-- | clang/lib/ASTMatchers/ASTMatchFinder.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/clang/lib/ASTMatchers/ASTMatchFinder.cpp b/clang/lib/ASTMatchers/ASTMatchFinder.cpp index ac8e4eccad8e..a27fac62bdef 100644 --- a/clang/lib/ASTMatchers/ASTMatchFinder.cpp +++ b/clang/lib/ASTMatchers/ASTMatchFinder.cpp @@ -779,7 +779,7 @@ private: #define IMPL(Index) \ template <typename NodeType> \ - typename std::enable_if_t< \ + std::enable_if_t< \ llvm::is_one_of<const NodeType *, CMD_TYPES_##Index>::value> \ SetCallbackAndRawNode(const MatchCallback *CB, const NodeType &N) { \ assertEmpty(); \ @@ -788,8 +788,8 @@ private: } \ \ template <typename T> \ - typename std::enable_if_t< \ - llvm::is_one_of<const T *, CMD_TYPES_##Index>::value, const T *> \ + std::enable_if_t<llvm::is_one_of<const T *, CMD_TYPES_##Index>::value, \ + const T *> \ getNode() const { \ assertHoldsState(); \ return Callback.getInt() == (Index) ? Node##Index.dyn_cast<const T *>() \ @@ -1562,7 +1562,7 @@ MatchFinder::~MatchFinder() {} void MatchFinder::addMatcher(const DeclarationMatcher &NodeMatch, MatchCallback *Action) { - llvm::Optional<TraversalKind> TK; + std::optional<TraversalKind> TK; if (Action) TK = Action->getCheckTraversalKind(); if (TK) @@ -1580,7 +1580,7 @@ void MatchFinder::addMatcher(const TypeMatcher &NodeMatch, void MatchFinder::addMatcher(const StatementMatcher &NodeMatch, MatchCallback *Action) { - llvm::Optional<TraversalKind> TK; + std::optional<TraversalKind> TK; if (Action) TK = Action->getCheckTraversalKind(); if (TK) @@ -1685,9 +1685,9 @@ void MatchFinder::registerTestCallbackAfterParsing( StringRef MatchFinder::MatchCallback::getID() const { return "<unknown>"; } -llvm::Optional<TraversalKind> +std::optional<TraversalKind> MatchFinder::MatchCallback::getCheckTraversalKind() const { - return llvm::None; + return std::nullopt; } } // end namespace ast_matchers |