Rename internal structure to not conflict with the new non-null warning

attribute.

2 files changed, 38 insertions, 1 deletions

diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo
index 059f148cc06..b694ac6700b 100644
--- a/x11/qt5-qtbase/distinfo
+++ b/x11/qt5-qtbase/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2015/08/30 04:13:46 markd Exp $
+$NetBSD: distinfo,v 1.24 2015/09/08 18:55:51 joerg Exp $
 
 SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd
 RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909
@@ -28,6 +28,7 @@ SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.
 SHA1 (patch-src_plugins_platforms_xcb_qxcbconnection_xi2.cpp) = cee1a36f16cabaaba45815c54ee262db90df0c98
 SHA1 (patch-src_tools_bootstrap_bootstrap.pro) = 46c40c3d205fc5bffd26dac1b231d7c5a33c2dba
 SHA1 (patch-src_tools_moc_main.cpp) = d5888014ad648cb06fa8c348e52102133e6a5f4b
+SHA1 (patch-src_tools_qlalr_lalr.cpp) = 33b1e65dc702fd96b60c0190d5ab86a11efbb735
 SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1
 SHA1 (patch-tests_auto_corelib_io_qprocess_qprocess.pro) = 7d5ccb008a30238fcf35e763832a494af51ed0ac
 SHA1 (patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = a0534c3fe05ea1d7a23170811d1da7fa740e31d1
diff --git a/x11/qt5-qtbase/patches/patch-src_tools_qlalr_lalr.cpp b/x11/qt5-qtbase/patches/patch-src_tools_qlalr_lalr.cpp
new file mode 100644
index 00000000000..4e3a45d3b4d
--- /dev/null
+++ b/x11/qt5-qtbase/patches/patch-src_tools_qlalr_lalr.cpp
@@ -0,0 +1,36 @@
+$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;
+