diff options
| author | David Schulz <david.schulz@digia.com> | 2014-03-07 13:18:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-15 10:46:17 +0100 |
| commit | cc0636ea1eb34b654bd14ce840d1ffa5a07e44fe (patch) | |
| tree | 2694b5a44aa0513dba9f0572c2576382841cc986 /src/corelib/tools/qmap.h | |
| parent | c6e271da6d1d972ad73a97871baafe57578a69a9 (diff) | |
Remove level 4 compiler warnings from MSVC.
Task-number: QTBUG-7233
Change-Id: I52067e3a22e98a62fd87415906e54a54ff2d6b49
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Dave McClelland
Diffstat (limited to 'src/corelib/tools/qmap.h')
| -rw-r--r-- | src/corelib/tools/qmap.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index db0cd6a2d6..487039ccfb 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -260,6 +260,11 @@ QMapNode<Key, T> *QMapNode<Key, T>::copy(QMapData<Key, T> *d) const return n; } +#if defined(Q_CC_MSVC) +#pragma warning( push ) +#pragma warning( disable : 4127 ) // conditional expression is constant +#endif + template <class Key, class T> void QMapNode<Key, T>::destroySubTree() { @@ -275,6 +280,10 @@ void QMapNode<Key, T>::destroySubTree() } } +#if defined(Q_CC_MSVC) +#pragma warning( pop ) +#endif + template <class Key, class T> void QMapData<Key, T>::deleteNode(QMapNode<Key, T> *z) { |