From 02529e4d9ae2b17c0f15f7f05681f6385bfaa05a Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sahumada@blackberry.com>
Date: Wed, 2 Apr 2014 11:37:55 +0200
Subject: [PATCH] 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: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
src/websockets/qdefaultmaskgenerator_p.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/websockets/qdefaultmaskgenerator_p.cpp b/src/websockets/qdefaultmaskgenerator_p.cpp
index da166aca..32b3309a 100644
--- a/src/websockets/qdefaultmaskgenerator_p.cpp
+++ b/src/websockets/qdefaultmaskgenerator_p.cpp
@@ -90,7 +90,7 @@ QDefaultMaskGenerator::~QDefaultMaskGenerator()
\internal
*/
-bool QDefaultMaskGenerator::seed()
+bool QDefaultMaskGenerator::seed() Q_DECL_NOEXCEPT
{
qsrand(static_cast<uint>(QDateTime::currentMSecsSinceEpoch()));
return true;
@@ -101,7 +101,7 @@ bool QDefaultMaskGenerator::seed()
\internal
*/
-quint32 QDefaultMaskGenerator::nextMask()
+quint32 QDefaultMaskGenerator::nextMask() Q_DECL_NOEXCEPT
{
return quint32((double(qrand()) / RAND_MAX) * std::numeric_limits<quint32>::max());
}
--
GitLab