diff options
Diffstat (limited to 'src/corelib/tools/qalgorithms.h')
| -rw-r--r-- | src/corelib/tools/qalgorithms.h | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/corelib/tools/qalgorithms.h b/src/corelib/tools/qalgorithms.h index 0ba3cad5e9..ff4d5a3ebd 100644 --- a/src/corelib/tools/qalgorithms.h +++ b/src/corelib/tools/qalgorithms.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -37,7 +37,9 @@ #include <QtCore/qglobal.h> QT_BEGIN_NAMESPACE - +QT_WARNING_PUSH +QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") +QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations") /* Warning: The contents of QAlgorithmsPrivate is not a part of the public Qt API @@ -524,7 +526,7 @@ QT_DEPRECATED_X("Use std::binary_search") Q_OUTOFLINE_TEMPLATE RandomAccessItera #define QALGORITHMS_USE_BUILTIN_POPCOUNT #endif -Q_DECL_CONSTEXPR inline uint qPopulationCount(quint32 v) +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qPopulationCount(quint32 v) Q_DECL_NOTHROW { #ifdef QALGORITHMS_USE_BUILTIN_POPCOUNT return __builtin_popcount(v); @@ -537,7 +539,7 @@ Q_DECL_CONSTEXPR inline uint qPopulationCount(quint32 v) #endif } -Q_DECL_CONSTEXPR inline uint qPopulationCount(quint8 v) +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qPopulationCount(quint8 v) Q_DECL_NOTHROW { #ifdef QALGORITHMS_USE_BUILTIN_POPCOUNT return __builtin_popcount(v); @@ -547,7 +549,7 @@ Q_DECL_CONSTEXPR inline uint qPopulationCount(quint8 v) #endif } -Q_DECL_CONSTEXPR inline uint qPopulationCount(quint16 v) +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qPopulationCount(quint16 v) Q_DECL_NOTHROW { #ifdef QALGORITHMS_USE_BUILTIN_POPCOUNT return __builtin_popcount(v); @@ -558,7 +560,7 @@ Q_DECL_CONSTEXPR inline uint qPopulationCount(quint16 v) #endif } -Q_DECL_CONSTEXPR inline uint qPopulationCount(quint64 v) +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qPopulationCount(quint64 v) Q_DECL_NOTHROW { #ifdef QALGORITHMS_USE_BUILTIN_POPCOUNT return __builtin_popcountll(v); @@ -573,7 +575,7 @@ Q_DECL_CONSTEXPR inline uint qPopulationCount(quint64 v) #endif } -Q_DECL_CONSTEXPR inline uint qPopulationCount(long unsigned int v) +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qPopulationCount(long unsigned int v) Q_DECL_NOTHROW { return qPopulationCount(static_cast<quint64>(v)); } @@ -582,7 +584,7 @@ Q_DECL_CONSTEXPR inline uint qPopulationCount(long unsigned int v) #undef QALGORITHMS_USE_BUILTIN_POPCOUNT #endif - +QT_WARNING_POP QT_END_NAMESPACE #endif // QALGORITHMS_H |