Skip to content

Commit 32fee08

Browse files
committed
fix: please clang-16
1 parent 2354635 commit 32fee08

File tree

1 file changed

+52
-11
lines changed

1 file changed

+52
-11
lines changed

test/unit-tests/printing/TypeScopeIterator.cpp

+52-11
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,11 @@ TEST_CASE(
591591
checkLambdaName(expectedLambdaName, iter);
592592
checkLambdaCallScope(
593593
iter,
594-
function_info_matchers{.specsMatcher = Catch::Matchers::Equals("const")});
594+
function_info_matchers<
595+
Catch::Matchers::IsEmptyMatcher,
596+
Catch::Matchers::IsEmptyMatcher,
597+
Catch::Matchers::StringEqualsMatcher>{
598+
.specsMatcher = Catch::Matchers::Equals("const")});
595599

596600
auto const topLevelScope = iter();
597601
CHECK(topLevelScope);
@@ -615,7 +619,11 @@ TEST_CASE(
615619
checkLambdaName("my_typeLambda", iter);
616620
checkLambdaCallScope(
617621
iter,
618-
function_info_matchers{.specsMatcher = Catch::Matchers::Equals("const")});
622+
function_info_matchers<
623+
Catch::Matchers::IsEmptyMatcher,
624+
Catch::Matchers::IsEmptyMatcher,
625+
Catch::Matchers::StringEqualsMatcher>{
626+
.specsMatcher = Catch::Matchers::Equals("const")});
619627
checkTopLevel(iter);
620628
REQUIRE_FALSE(iter());
621629
}
@@ -631,7 +639,10 @@ TEST_CASE(
631639
checkLambdaName("my_typeUnaryLambda", iter);
632640
checkLambdaCallScope(
633641
iter,
634-
function_info_matchers{
642+
function_info_matchers<
643+
Catch::Matchers::IsEmptyMatcher,
644+
Catch::Matchers::StringEqualsMatcher,
645+
Catch::Matchers::StringEqualsMatcher>{
635646
.argListMatcher = Catch::Matchers::Equals("int"),
636647
.specsMatcher = Catch::Matchers::Equals("const")});
637648
checkTopLevel(iter);
@@ -649,7 +660,10 @@ TEST_CASE(
649660
checkLambdaName("my_typeBinaryLambda", iter);
650661
checkLambdaCallScope(
651662
iter,
652-
function_info_matchers{
663+
function_info_matchers<
664+
Catch::Matchers::IsEmptyMatcher,
665+
Catch::Matchers::RegexMatcher,
666+
Catch::Matchers::StringEqualsMatcher>{
653667
.argListMatcher = Catch::Matchers::Matches(R"(int,\s?float)"),
654668
.specsMatcher = Catch::Matchers::Equals("const")});
655669
checkTopLevel(iter);
@@ -681,7 +695,11 @@ TEST_CASE(
681695
checkLambdaName("my_typeNoexceptLambda", iter);
682696
checkLambdaCallScope(
683697
iter,
684-
function_info_matchers{.specsMatcher = Catch::Matchers::Equals("const")});
698+
function_info_matchers<
699+
Catch::Matchers::IsEmptyMatcher,
700+
Catch::Matchers::IsEmptyMatcher,
701+
Catch::Matchers::StringEqualsMatcher>{
702+
.specsMatcher = Catch::Matchers::Equals("const")});
685703
checkTopLevel(iter);
686704
REQUIRE_FALSE(iter());
687705
}
@@ -697,10 +715,18 @@ TEST_CASE(
697715
checkLambdaName("my_typeNestedLambda", iter);
698716
checkLambdaCallScope(
699717
iter,
700-
function_info_matchers{.specsMatcher = Catch::Matchers::Equals("const")});
718+
function_info_matchers<
719+
Catch::Matchers::IsEmptyMatcher,
720+
Catch::Matchers::IsEmptyMatcher,
721+
Catch::Matchers::StringEqualsMatcher>{
722+
.specsMatcher = Catch::Matchers::Equals("const")});
701723
checkLambdaCallScope(
702724
iter,
703-
function_info_matchers{.specsMatcher = Catch::Matchers::Equals("const")});
725+
function_info_matchers<
726+
Catch::Matchers::IsEmptyMatcher,
727+
Catch::Matchers::IsEmptyMatcher,
728+
Catch::Matchers::StringEqualsMatcher>{
729+
.specsMatcher = Catch::Matchers::Equals("const")});
704730
checkTopLevel(iter);
705731
REQUIRE_FALSE(iter());
706732
}
@@ -716,10 +742,17 @@ TEST_CASE(
716742
checkLambdaName("my_typeComplexNestedLambda", iter);
717743
checkLambdaCallScope(
718744
iter,
719-
function_info_matchers{.specsMatcher = Catch::Matchers::Equals("const")});
745+
function_info_matchers<
746+
Catch::Matchers::IsEmptyMatcher,
747+
Catch::Matchers::IsEmptyMatcher,
748+
Catch::Matchers::StringEqualsMatcher>{
749+
.specsMatcher = Catch::Matchers::Equals("const")});
720750
checkLambdaCallScope(
721751
iter,
722-
function_info_matchers{
752+
function_info_matchers<
753+
Catch::Matchers::IsEmptyMatcher,
754+
Catch::Matchers::RegexMatcher,
755+
Catch::Matchers::StringEqualsMatcher>{
723756
.argListMatcher = Catch::Matchers::Matches(R"(int,\s?float)"),
724757
.specsMatcher = Catch::Matchers::Equals("const")});
725758
checkTopLevel(iter);
@@ -845,7 +878,11 @@ TEST_CASE(
845878
checkTemplateFunctionScope(
846879
iter,
847880
Catch::Matchers::Equals("my_typeTemplateFreeFunction"),
848-
template_info_matchers{.argListMatcher = Catch::Matchers::Equals("int")},
881+
function_info_matchers<
882+
Catch::Matchers::IsEmptyMatcher,
883+
Catch::Matchers::StringEqualsMatcher,
884+
Catch::Matchers::IsEmptyMatcher>{
885+
.argListMatcher = Catch::Matchers::Equals("int")},
849886
function_info_matchers{});
850887
checkNamedScope(
851888
iter,
@@ -933,7 +970,11 @@ TEST_CASE(
933970
checkTemplateFunctionScope(
934971
iter,
935972
Catch::Matchers::Equals("my_typeTemplateFreeFunction"),
936-
template_info_matchers{.argListMatcher = Catch::Matchers::Equals("int")},
973+
function_info_matchers<
974+
Catch::Matchers::IsEmptyMatcher,
975+
Catch::Matchers::StringEqualsMatcher,
976+
Catch::Matchers::IsEmptyMatcher>{
977+
.argListMatcher = Catch::Matchers::Equals("int")},
937978
function_info_matchers{});
938979
checkNamedScope(
939980
iter,

0 commit comments

Comments
 (0)