Merge topic 'benchmark-read-file'

e0e24090a Correct argument check for benchmark --file argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2361
This commit is contained in:
Kenneth Moreland 2020-12-22 14:24:15 +00:00 committed by Kitware Robot
commit bc987d53be

@ -775,6 +775,10 @@ struct Arg : vtkm::cont::internal::option::Arg
bool msg)
{
if ((option.arg != nullptr) && (option.arg[0] != '\0'))
{
return vtkm::cont::internal::option::ARG_OK;
}
else
{
if (msg)
{
@ -782,10 +786,6 @@ struct Arg : vtkm::cont::internal::option::Arg
}
return vtkm::cont::internal::option::ARG_ILLEGAL;
}
else
{
return vtkm::cont::internal::option::ARG_OK;
}
}
};