diff options
| author |   patrick <patrick@openbsd.org> | 2019-06-23 21:36:31 +0000 |
|---|---|---|
| committer | patrick <patrick@openbsd.org> | 2019-06-23 21:36:31 +0000 |
| commit | 23f101f37937a1bd4a29726cab2f76e0fb038b35 (patch) | |
| tree | f7da7d6b32c2e07114da399150bfa88d72187012 /gnu/llvm/tools/clang/lib/Format/NamespaceEndCommentsFixer.cpp | |
| parent | sort previous; ok deraadt (diff) | |
| download | wireguard-openbsd-23f101f37937a1bd4a29726cab2f76e0fb038b35.tar.xz wireguard-openbsd-23f101f37937a1bd4a29726cab2f76e0fb038b35.zip | |
Import LLVM 8.0.0 release including clang, lld and lldb.
Diffstat (limited to 'gnu/llvm/tools/clang/lib/Format/NamespaceEndCommentsFixer.cpp')
| -rw-r--r-- | gnu/llvm/tools/clang/lib/Format/NamespaceEndCommentsFixer.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gnu/llvm/tools/clang/lib/Format/NamespaceEndCommentsFixer.cpp b/gnu/llvm/tools/clang/lib/Format/NamespaceEndCommentsFixer.cpp index 995b3219a1f..dd364866d1c 100644 --- a/gnu/llvm/tools/clang/lib/Format/NamespaceEndCommentsFixer.cpp +++ b/gnu/llvm/tools/clang/lib/Format/NamespaceEndCommentsFixer.cpp @@ -125,12 +125,7 @@ getNamespaceToken(const AnnotatedLine *Line, if (StartLineIndex > 0) NamespaceTok = AnnotatedLines[StartLineIndex - 1]->First; } - // Detect "(inline)? namespace" in the beginning of a line. - if (NamespaceTok->is(tok::kw_inline)) - NamespaceTok = NamespaceTok->getNextNonComment(); - if (!NamespaceTok || NamespaceTok->isNot(tok::kw_namespace)) - return nullptr; - return NamespaceTok; + return NamespaceTok->getNamespaceToken(); } NamespaceEndCommentsFixer::NamespaceEndCommentsFixer(const Environment &Env, |