Skip to content

Commit

Permalink
Merge branch 'fix-command-line-args' into 'master'
Browse files Browse the repository at this point in the history
re-add falsely removed code

See merge request integer/soplex!424
  • Loading branch information
leoneifler committed Jan 19, 2024
2 parents 9f42978 + a3ad93a commit b10b149
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/soplexmain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,8 @@ int runSoPlex(int argc, char* argv[])
// option string must start with '-', must contain at least two characters, and exactly two characters if and
// only if it is -x, -y, -q, or -c
if(option[0] != '-' || option[1] == '\0'
|| ((option[2] == '\0') != (option[1] == 'q' || option[1] == 'c')))
|| ((option[2] == '\0') != (option[1] == 'x' || option[1] == 'X' || option[1] == 'y'
|| option[1] == 'Y' || option[1] == 'q' || option[1] == 'c')))
{
printUsage(argv, optidx);
returnValue = 1;
Expand Down Expand Up @@ -1470,7 +1471,8 @@ int main(int argc, char* argv[])
// option string must start with '-', must contain at least two characters, and exactly two characters if and
// only if it is -q, or -c
if(option[0] != '-' || option[1] == '\0'
|| ((option[2] == '\0') != (option[1] == 'q' || option[1] == 'c')))
|| ((option[2] == '\0') != (option[1] == 'x' || option[1] == 'X' || option[1] == 'y'
|| option[1] == 'Y' || option[1] == 'q' || option[1] == 'c')))
{
printUsage(argv, optidx);
return 1;
Expand Down

0 comments on commit b10b149

Please sign in to comment.