QCommandLineOption: Q_DECL_NOTHROW -> Q_DECL_NOEXCEPT

In IsInvalidName::operator(), marked as _NOTHROW, we're calling qWarning(),
which, of course, _can_ throw. We don't care in that case, but then we
musn't use _NOTHROW, which causes UB on MSVC, but _NOEXCEPT, which causes
std::terminate to be called.

Change-Id: I18f74546ea3b388495fdb173d3abd9a162fb78a9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Marc Mutz 2015-06-27 11:07:57 +02:00
parent 435a3d7741
commit a8df43cd65
1 changed files with 1 additions and 1 deletions

View File

@ -250,7 +250,7 @@ namespace {
typedef bool result_type;
typedef QString argument_type;
result_type operator()(const QString &name) const Q_DECL_NOTHROW
result_type operator()(const QString &name) const Q_DECL_NOEXCEPT
{
if (name.isEmpty()) {
qWarning("QCommandLineOption: Option names cannot be empty");