Merge pull request #21937 from Kumataro:4.x-fix-21911

* Fix warnings for clang15

* Fix warnings: Remove unnecessary code

* Fix warnings: Remove unnecessary code
This commit is contained in:
Kumataro
2022-05-14 02:32:05 +09:00
committed by GitHub
parent 2b67bc448d
commit 602caa9cd6
23 changed files with 28 additions and 52 deletions
+3 -1
View File
@@ -606,7 +606,9 @@ namespace
MergeContext mc;
bool there_was_a_merge = false;
#ifdef DEBUG_MERGE
std::size_t iteration = 0u;
#endif
do
{
there_was_a_merge = false;
@@ -615,8 +617,8 @@ namespace
#ifdef DEBUG_MERGE
GAPI_LOG_INFO(NULL, "Before next merge attempt " << iteration << "...");
merge_debug(g, iteration);
#endif
iteration++;
#endif
auto sorted = pass_helpers::topoSort(im);
for (auto nh : sorted)
{
@@ -569,7 +569,6 @@ TEST_F(S11N_Basic, Test_Bind_RunArgs_MatScalar) {
v[0] = cv::GRunArg{ mat };
v[1] = cv::GRunArg{ scalar };
GRunArgsP output = cv::gapi::bind(v);
unsigned int i = 0;
for (auto it : output)
{
using T = cv::GRunArgP;
@@ -591,7 +590,6 @@ TEST_F(S11N_Basic, Test_Bind_RunArgs_MatScalar) {
GAPI_Assert(false && "This value type is not supported!"); // ...maybe because of STANDALONE mode.
break;
}
i++;
}
}