aboutsummaryrefslogtreecommitdiff
path: root/clang-tools-extra/clang-tidy/modernize
diff options
context:
space:
mode:
Diffstat (limited to 'clang-tools-extra/clang-tidy/modernize')
-rw-r--r--clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp14
-rw-r--r--clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp5
2 files changed, 10 insertions, 9 deletions
diff --git a/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp b/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
index 37aa26d..bf340984 100644
--- a/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
@@ -368,14 +368,14 @@ static std::optional<ContainerCall> getContainerExpr(const Expr *Call) {
return ContainerCall{TheCall->getImplicitObjectArgument(),
Member->getMemberDecl()->getName(),
Member->isArrow(), CallKind};
- } else {
- if (TheCall->getDirectCallee() == nullptr ||
- !MemberNames.contains(TheCall->getDirectCallee()->getName()))
- return std::nullopt;
- return ContainerCall{TheCall->getArg(0),
- TheCall->getDirectCallee()->getName(), false,
- CallKind};
}
+ if (TheCall->getDirectCallee() == nullptr ||
+ !MemberNames.contains(TheCall->getDirectCallee()->getName()))
+ return std::nullopt;
+ return ContainerCall{TheCall->getArg(0),
+ TheCall->getDirectCallee()->getName(), false,
+ CallKind};
+
} else if (const auto *TheCall = dyn_cast_or_null<CallExpr>(Dug)) {
if (TheCall->getNumArgs() != 1)
return std::nullopt;
diff --git a/clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp
index 75ebfbd..310b5bf 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp
@@ -168,8 +168,9 @@ matchTrailingTemplateParam(const FunctionTemplateDecl *FunctionTemplate) {
return {matchEnableIfSpecialization(
LastTemplateParam->getTypeSourceInfo()->getTypeLoc()),
LastTemplateParam};
- } else if (const auto *LastTemplateParam =
- dyn_cast<TemplateTypeParmDecl>(LastParam)) {
+ }
+ if (const auto *LastTemplateParam =
+ dyn_cast<TemplateTypeParmDecl>(LastParam)) {
if (LastTemplateParam->hasDefaultArgument() &&
LastTemplateParam->getIdentifier() == nullptr) {
return {matchEnableIfSpecialization(