From 6f0df02d002356625f10683ef84da7685d92a2c4 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 12 Aug 2020 14:14:02 +0200 Subject: Replace Qt CONSTEXPR defines with constexpr Both normal and relaxed constexpr are required by our new minimum of C++17. Change-Id: Ic028b88a2e7a6cb7d5925f3133b9d54859a81744 Reviewed-by: Sona Kurazyan --- src/corelib/global/qendian_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/global/qendian_p.h') diff --git a/src/corelib/global/qendian_p.h b/src/corelib/global/qendian_p.h index c830e65b54..d0d79d4ce4 100644 --- a/src/corelib/global/qendian_p.h +++ b/src/corelib/global/qendian_p.h @@ -65,7 +65,7 @@ protected: typedef typename S::StorageType T; typedef typename std::make_unsigned::type UT; - static Q_DECL_CONSTEXPR UT mask() + static constexpr UT mask() { return ((UT(1) << width) - 1) << pos; } -- cgit v1.2.3