summaryrefslogtreecommitdiff
path: root/x11/qt5-qtbase/patches/patch-src_tools_qlalr_lalr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'x11/qt5-qtbase/patches/patch-src_tools_qlalr_lalr.cpp')
-rw-r--r--x11/qt5-qtbase/patches/patch-src_tools_qlalr_lalr.cpp36
1 files changed, 0 insertions, 36 deletions
diff --git a/x11/qt5-qtbase/patches/patch-src_tools_qlalr_lalr.cpp b/x11/qt5-qtbase/patches/patch-src_tools_qlalr_lalr.cpp
deleted file mode 100644
index 4e3a45d3b4d..00000000000
--- a/x11/qt5-qtbase/patches/patch-src_tools_qlalr_lalr.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-src_tools_qlalr_lalr.cpp,v 1.1 2015/09/08 18:55:51 joerg Exp $
-
---- src/tools/qlalr/lalr.cpp.orig 2015-08-30 17:58:52.000000000 +0000
-+++ src/tools/qlalr/lalr.cpp
-@@ -238,11 +238,11 @@ void Grammar::buildExtendedGrammar ()
- non_terminals.insert (accept_symbol);
- }
-
--struct _Nullable: public std::unary_function<Name, bool>
-+struct qt_Nullable: public std::unary_function<Name, bool>
- {
- Automaton *_M_automaton;
-
-- _Nullable (Automaton *aut):
-+ qt_Nullable (Automaton *aut):
- _M_automaton (aut) {}
-
- bool operator () (Name name) const
-@@ -300,7 +300,7 @@ void Automaton::buildNullables ()
-
- for (RulePointer rule = _M_grammar->rules.begin (); rule != _M_grammar->rules.end (); ++rule)
- {
-- NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (_Nullable (this)));
-+ NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (qt_Nullable (this)));
-
- if (nn == rule->rhs.end ())
- changed |= nullables.insert (rule->lhs).second;
-@@ -635,7 +635,7 @@ void Automaton::buildIncludesDigraph ()
- if (! _M_grammar->isNonTerminal (*A))
- continue;
-
-- NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (_Nullable (this)));
-+ NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (qt_Nullable (this)));
- if (first_not_nullable != rule->rhs.end ())
- continue;
-