summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2017-03-08 09:49:12 +0000
committerDaniel Jasper <djasper@google.com>2017-03-08 09:49:12 +0000
commit628dd85b32bb7bdab547f1ae1560435764197510 (patch)
treeb5b132b17c387607ff27736f2c5fe38e68670277 /clang/lib/Format
parent836bcc689f4e3aa39ec1788cd107c93e04804c66 (diff)
downloadbcm5719-llvm-628dd85b32bb7bdab547f1ae1560435764197510.tar.gz
bcm5719-llvm-628dd85b32bb7bdab547f1ae1560435764197510.zip
clang-format: Get slightly better at understanding */&.
Before: void f() { MACRO(A * const a); } After: void f() { MACRO(A *const a); } llvm-svn: 297268
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/TokenAnnotator.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 1a3b3520494..97a22d8e97e 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -1302,7 +1302,8 @@ private:
return TT_UnaryOperator;
const FormatToken *NextToken = Tok.getNextNonComment();
- if (!NextToken || NextToken->isOneOf(tok::arrow, tok::equal) ||
+ if (!NextToken ||
+ NextToken->isOneOf(tok::arrow, tok::equal, tok::kw_const) ||
(NextToken->is(tok::l_brace) && !NextToken->getNextNonComment()))
return TT_PointerOrReference;
OpenPOWER on IntegriCloud