Skip to content
Snippets Groups Projects
Commit 1541d849 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'Wextra-semi'


f44cbf93 Fixed clang -Wextra-semi-stmt warnings

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !117
parents abb8c680 f44cbf93
No related branches found
No related tags found
1 merge request!117Fixed clang -Wextra-semi-stmt warnings
...@@ -1162,7 +1162,7 @@ static int kwsysProcessWaitForPipe(kwsysProcess* cp, char** data, int* length, ...@@ -1162,7 +1162,7 @@ static int kwsysProcessWaitForPipe(kwsysProcess* cp, char** data, int* length,
case KWSYSPE_PIPE_STDERR: case KWSYSPE_PIPE_STDERR:
wd->PipeId = kwsysProcess_Pipe_STDERR; wd->PipeId = kwsysProcess_Pipe_STDERR;
break; break;
}; }
return 1; return 1;
} }
} else if (n < 0 && errno == EAGAIN) { } else if (n < 0 && errno == EAGAIN) {
......
...@@ -165,25 +165,26 @@ int testCommandLineArguments(int argc, char* argv[]) ...@@ -165,25 +165,26 @@ int testCommandLineArguments(int argc, char* argv[])
} }
size_t cc; size_t cc;
#define CompareTwoLists(list1, list_valid, lsize) \ #define CompareTwoLists(list1, list_valid, lsize) \
if (list1.size() != lsize) { \ do { \
std::cerr << "Problem setting " #list1 ". Size is: " << list1.size() \ if (list1.size() != lsize) { \
<< " should be: " << lsize << std::endl; \ std::cerr << "Problem setting " #list1 ". Size is: " << list1.size() \
res = 1; \ << " should be: " << lsize << std::endl; \
} else { \ res = 1; \
std::cout << #list1 " argument set:"; \ } else { \
for (cc = 0; cc < lsize; ++cc) { \ std::cout << #list1 " argument set:"; \
std::cout << " " << list1[cc]; \ for (cc = 0; cc < lsize; ++cc) { \
if (!CompareTwoItemsOnList(list1[cc], list_valid[cc])) { \ std::cout << " " << list1[cc]; \
std::cerr << "Problem setting " #list1 ". Value of " << cc \ if (!CompareTwoItemsOnList(list1[cc], list_valid[cc])) { \
<< " is: [" << list1[cc] << "] <> [" << list_valid[cc] \ std::cerr << "Problem setting " #list1 ". Value of " << cc \
<< "]" << std::endl; \ << " is: [" << list1[cc] << "] <> [" << list_valid[cc] \
res = 1; \ << "]" << std::endl; \
break; \ res = 1; \
break; \
} \
} \ } \
std::cout << std::endl; \
} \ } \
std::cout << std::endl; \ } while (0)
}
CompareTwoLists(numbers_argument, valid_numbers, 10); CompareTwoLists(numbers_argument, valid_numbers, 10);
CompareTwoLists(doubles_argument, valid_doubles, 3); CompareTwoLists(doubles_argument, valid_doubles, 3);
CompareTwoLists(bools_argument, valid_bools, 3); CompareTwoLists(bools_argument, valid_bools, 3);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment