diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0008-Fix-build-with-clang-3.7.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0008-Fix-build-with-clang-3.7.patch | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/recipes-qt/qt5/qtbase/0008-Fix-build-with-clang-3.7.patch b/recipes-qt/qt5/qtbase/0008-Fix-build-with-clang-3.7.patch deleted file mode 100644 index 6583e80a..00000000 --- a/recipes-qt/qt5/qtbase/0008-Fix-build-with-clang-3.7.patch +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | From 63111eaec5cb758d99d68a4e9ec827b79121544b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 23 Aug 2015 15:19:41 -0700 | ||
4 | Subject: [PATCH 08/10] Fix build with clang 3.7 | ||
5 | |||
6 | Nullable is a language extension in clang 3.7 (indicating whether or | ||
7 | not a pointer can be null). | ||
8 | http://clang.llvm.org/docs/AttributeReference.html#nullable | ||
9 | Using it as a class name breaks building with this compiler | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | This is backport of https://codereview.qt-project.org/#/c/121545/ | ||
13 | |||
14 | /mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/armv7at2hf-vfp-neon-angstrom-linux-gnueabi/qtbase/5.4.2+gitAUTOINC+2cb17c1fb9-r0/git/src/tools/qlalr/lalr.cpp:241:1: error: declaration of anonymous | ||
15 | struct must be a definition | ||
16 | struct _Nullable: public std::unary_function<Name, bool> | ||
17 | ^ | ||
18 | /mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/armv7at2hf-vfp-neon-angstrom-linux-gnueabi/qtbase/5.4.2+gitAUTOINC+2cb17c1fb9-r0/git/src/tools/qlalr/lalr.cpp:241:56: error: expected unqualified-id | ||
19 | struct _Nullable: public std::unary_function<Name, bool> | ||
20 | ^ | ||
21 | /mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/armv7at2hf-vfp-neon-angstrom-linux-gnueabi/qtbase/5.4.2+gitAUTOINC+2cb17c1fb9-r0/git/src/tools/qlalr/lalr.cpp:303:98: error: expected expression | ||
22 | NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (_Nullable (this))); | ||
23 | ^ | ||
24 | /mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/armv7at2hf-vfp-neon-angstrom-linux-gnueabi/qtbase/5.4.2+gitAUTOINC+2cb17c1fb9-r0/git/src/tools/qlalr/lalr.cpp:638:107: error: expected expression | ||
25 | NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (_Nullable (this))); | ||
26 | ^ | ||
27 | 4 errors generated. | ||
28 | |||
29 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
30 | --- | ||
31 | src/tools/qlalr/lalr.cpp | 8 ++++---- | ||
32 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
33 | |||
34 | diff --git a/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp | ||
35 | index 3d0d5de..3d780cd 100644 | ||
36 | --- a/src/tools/qlalr/lalr.cpp | ||
37 | +++ b/src/tools/qlalr/lalr.cpp | ||
38 | @@ -238,11 +238,11 @@ void Grammar::buildExtendedGrammar () | ||
39 | non_terminals.insert (accept_symbol); | ||
40 | } | ||
41 | |||
42 | -struct _Nullable: public std::unary_function<Name, bool> | ||
43 | +struct Nullable: public std::unary_function<Name, bool> | ||
44 | { | ||
45 | Automaton *_M_automaton; | ||
46 | |||
47 | - _Nullable (Automaton *aut): | ||
48 | + Nullable (Automaton *aut): | ||
49 | _M_automaton (aut) {} | ||
50 | |||
51 | bool operator () (Name name) const | ||
52 | @@ -300,7 +300,7 @@ void Automaton::buildNullables () | ||
53 | |||
54 | for (RulePointer rule = _M_grammar->rules.begin (); rule != _M_grammar->rules.end (); ++rule) | ||
55 | { | ||
56 | - NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (_Nullable (this))); | ||
57 | + NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (Nullable (this))); | ||
58 | |||
59 | if (nn == rule->rhs.end ()) | ||
60 | changed |= nullables.insert (rule->lhs).second; | ||
61 | @@ -635,7 +635,7 @@ void Automaton::buildIncludesDigraph () | ||
62 | if (! _M_grammar->isNonTerminal (*A)) | ||
63 | continue; | ||
64 | |||
65 | - NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (_Nullable (this))); | ||
66 | + NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (Nullable (this))); | ||
67 | if (first_not_nullable != rule->rhs.end ()) | ||
68 | continue; | ||
69 | |||
70 | -- | ||
71 | 2.5.0 | ||
72 | |||