summaryrefslogtreecommitdiffstats
path: root/clang-tools-extra/clang-tidy/utils
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2014-08-20 16:01:42 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2014-08-20 16:01:42 +0000
commit208faaaa290319b7eecab112e7922f88097c3ebe (patch)
tree70bd895cc894ef8f92e5f92bd3f000df5199cf73 /clang-tools-extra/clang-tidy/utils
parent061beab6730c9d308705333a18172bd19bd5c87c (diff)
downloadbcm5719-llvm-208faaaa290319b7eecab112e7922f88097c3ebe.tar.gz
bcm5719-llvm-208faaaa290319b7eecab112e7922f88097c3ebe.zip
[clang-tidy] Allow /**/ comments on #endifs when checking header guards.
Turning block comments into line comments just creates unecessary churn. llvm-svn: 216072
Diffstat (limited to 'clang-tools-extra/clang-tidy/utils')
-rw-r--r--clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp b/clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp
index 327722dbbc6..133b2db2944 100644
--- a/clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp
+++ b/clang-tools-extra/clang-tidy/utils/HeaderGuard.cpp
@@ -164,7 +164,8 @@ public:
size_t EndIfLen = std::strcspn(EndIfData, "\r\n");
StringRef EndIfStr(EndIfData, EndIfLen);
- if (EndIf.isValid() && !EndIfStr.endswith("// " + HeaderGuard.str())) {
+ if (EndIf.isValid() && !EndIfStr.endswith("// " + HeaderGuard.str()) &&
+ !EndIfStr.endswith("/* " + HeaderGuard.str() + " */")) {
std::string Correct = "endif // " + HeaderGuard.str();
Check->diag(EndIf, "#endif for a header guard should reference the "
"guard macro in a comment")
OpenPOWER on IntegriCloud