Commit 02529e4d authored by Sergio Ahumada's avatar Sergio Ahumada Committed by The Qt Project
Browse files

Fix compilation on QNX


Add Q_DECL_NOEXCEPT to 'bool seed()' and 'quint32 nextMask()'

  qdefaultmaskgenerator_p.cpp:93:34: error: declaration of 'virtual bool QDefaultMaskGenerator::seed()' has a different exception specifier
  qdefaultmaskgenerator_p.h:69:10: error: from previous declaration 'virtual bool QDefaultMaskGenerator::seed() noexcept (true)'
  qdefaultmaskgenerator_p.cpp:104:41: error: declaration of 'virtual quint32 QDefaultMaskGenerator::nextMask()' has a different exception specifier
  qdefaultmaskgenerator_p.h:70:13: error: from previous declaration 'virtual quint32 QDefaultMaskGenerator::nextMask() noexcept (true)'

Change-Id: Iae49a060fa62a33f629cadc1a0100653a12432f7
Reviewed-by: default avatarOlivier Goffart <ogoffart@woboq.com>
Reviewed-by: default avatarFabian Bumberger <fbumberger@rim.com>
Reviewed-by: default avatarThiago Macieira <thiago.macieira@intel.com>
Showing with 2 additions and 2 deletions
...@@ -90,7 +90,7 @@ QDefaultMaskGenerator::~QDefaultMaskGenerator() ...@@ -90,7 +90,7 @@ QDefaultMaskGenerator::~QDefaultMaskGenerator()
\internal \internal
*/ */
bool QDefaultMaskGenerator::seed() bool QDefaultMaskGenerator::seed() Q_DECL_NOEXCEPT
{ {
qsrand(static_cast<uint>(QDateTime::currentMSecsSinceEpoch())); qsrand(static_cast<uint>(QDateTime::currentMSecsSinceEpoch()));
return true; return true;
...@@ -101,7 +101,7 @@ bool QDefaultMaskGenerator::seed() ...@@ -101,7 +101,7 @@ bool QDefaultMaskGenerator::seed()
\internal \internal
*/ */
quint32 QDefaultMaskGenerator::nextMask() quint32 QDefaultMaskGenerator::nextMask() Q_DECL_NOEXCEPT
{ {
return quint32((double(qrand()) / RAND_MAX) * std::numeric_limits<quint32>::max()); return quint32((double(qrand()) / RAND_MAX) * std::numeric_limits<quint32>::max());
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment