|
 |
50d94e |
From 3c42d4d3dce95b67d65541c5612384eab0c3e27b Mon Sep 17 00:00:00 2001
|
|
|
b602f4 |
From: Dmitry Shachnev <mitya57@gmail.com>
|
|
|
b602f4 |
Date: Wed, 18 Aug 2021 22:50:29 +0300
|
|
|
50d94e |
Subject: [PATCH 06/20] Include <limits> in Yarr.h to fix build with GCC 11
|
|
|
b602f4 |
MIME-Version: 1.0
|
|
|
b602f4 |
Content-Type: text/plain; charset=UTF-8
|
|
|
b602f4 |
Content-Transfer-Encoding: 8bit
|
|
|
b602f4 |
|
|
|
b602f4 |
- <limits.h> (aka <climits>) is needed for UINT_MAX macro constant.
|
|
|
b602f4 |
- <limits> is needed for std::numeric_limits.
|
|
|
b602f4 |
|
|
|
b602f4 |
Without this fix, qtdeclarative failed to build on some platforms:
|
|
|
b602f4 |
|
|
|
b602f4 |
In file included from jsruntime/qv4regexp_p.h:62,
|
|
|
b602f4 |
from jsruntime/qv4regexp.cpp:40:
|
|
|
b602f4 |
../3rdparty/masm/yarr/Yarr.h:46:44: error: ‘numeric_limits’ is not a member of ‘std’
|
|
|
b602f4 |
46 | static const unsigned offsetNoMatch = std::numeric_limits<unsigned>::max();
|
|
|
b602f4 |
| ^~~~~~~~~~~~~~
|
|
|
b602f4 |
|
|
|
b602f4 |
Pick-to: 5.15 6.2
|
|
|
b602f4 |
Change-Id: I7cc9f7bc6624a52c8659f09034ab16064da5fd2f
|
|
|
b602f4 |
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
|
|
|
b602f4 |
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
|
b602f4 |
(cherry picked from commit db58b8518e157b765bf2e01e6382a9eed4751f27)
|
|
|
b602f4 |
---
|
|
|
b602f4 |
src/3rdparty/masm/yarr/Yarr.h | 1 +
|
|
|
b602f4 |
1 file changed, 1 insertion(+)
|
|
|
b602f4 |
|
|
|
b602f4 |
diff --git a/src/3rdparty/masm/yarr/Yarr.h b/src/3rdparty/masm/yarr/Yarr.h
|
|
|
b602f4 |
index ccf78f9880..2955ea7e72 100644
|
|
|
b602f4 |
--- a/src/3rdparty/masm/yarr/Yarr.h
|
|
|
b602f4 |
+++ b/src/3rdparty/masm/yarr/Yarr.h
|
|
|
b602f4 |
@@ -28,6 +28,7 @@
|
|
|
b602f4 |
#pragma once
|
|
|
b602f4 |
|
|
|
b602f4 |
#include <limits.h>
|
|
|
b602f4 |
+#include <limits>
|
|
|
b602f4 |
#include "YarrErrorCode.h"
|
|
|
b602f4 |
|
|
|
b602f4 |
namespace JSC { namespace Yarr {
|
|
|
b602f4 |
--
|
|
|
50d94e |
2.35.1
|
|
|
b602f4 |
|