Created
August 3, 2015 10:35
-
-
Save tloszko/89cbba0e2fe0fa0b2805 to your computer and use it in GitHub Desktop.
brew QT5 patch for 5.5.0 head el captain
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/qtbase/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp | |
index 3d0d5de..3d780cd 100644 | |
--- a/qtbase/src/tools/qlalr/lalr.cpp | |
+++ b/qtbase/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 Nullable: public std::unary_function<Name, bool> | |
{ | |
Automaton *_M_automaton; | |
- _Nullable (Automaton *aut): | |
+ 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 (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 (Nullable (this))); | |
if (first_not_nullable != rule->rhs.end ()) | |
continue; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment