diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-04-02 11:37:55 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-04 03:36:17 +0200 |
| commit | 02529e4d9ae2b17c0f15f7f05681f6385bfaa05a (patch) | |
| tree | 69327d1c5f1159bd39e505a1588aa25a0823936b /src | |
| parent | 29d9f1d867f84dede86cb41c27e38541a24186ff (diff) | |
| download | qtwebsockets-02529e4d9ae2b17c0f15f7f05681f6385bfaa05a.tar.gz | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/websockets/qdefaultmaskgenerator_p.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/websockets/qdefaultmaskgenerator_p.cpp b/src/websockets/qdefaultmaskgenerator_p.cpp index da166ac..32b3309 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()); } |