From c851050faec75ca3234e0fad693cbce0e232dd5a Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 28 Oct 2024 09:07:03 +0100 Subject: [PATCH] QSmallByteArray: add missing Windows min/max macro protection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is in preparation of moving the type into its own header file. Amends 29050fa65b7c755ec3238ff0cc238c626832bc8c. Task-number: QTCREATORBUG-28838 Pick-to: 6.5 Change-Id: I9dd35c1adc9b1ea32d8616ace89975c07a380ae4 Reviewed-by: Ivan Solovev Reviewed-by: MÃ¥rten Nordheim (cherry picked from commit 4a1e0ddeae566ab730c1505bb654471509ba0cfa) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/tools/qcryptographichash.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp index 1c122d5620f..f6b7aee4553 100644 --- a/src/corelib/tools/qcryptographichash.cpp +++ b/src/corelib/tools/qcryptographichash.cpp @@ -128,7 +128,7 @@ template class QSmallByteArray { std::array m_data; - static_assert(N <= std::numeric_limits::max()); + static_assert(N <= (std::numeric_limits::max)()); quint8 m_size = 0; public: QSmallByteArray() = default;