diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-24 16:27:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-24 16:29:14 +0200 |
| commit | f82e5085169876e0ec7c1b744d021b068c281cfe (patch) | |
| tree | a870e1f68ce62818a0793c4c78a67971e841e676 /src/tools | |
| parent | f74d4fb1dacc682e2e6f4a44e4240f642a2c3b70 (diff) | |
| parent | ee47999333dde1d38b73d04e142e05f06f8c56ed (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
mkspecs/features/qt_common.prf
src/corelib/tools/qstring.cpp
src/plugins/platforms/windows/qwindowsmousehandler.cpp
src/widgets/widgets/qmainwindowlayout_p.h
Change-Id: I5df613008f6336f69b257d08e49a133d033a9d65
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qlalr/compress.cpp | 6 | ||||
| -rw-r--r-- | src/tools/qlalr/lalr.cpp | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/tools/qlalr/compress.cpp b/src/tools/qlalr/compress.cpp index a486e68c4a..0ededbd920 100644 --- a/src/tools/qlalr/compress.cpp +++ b/src/tools/qlalr/compress.cpp @@ -37,7 +37,7 @@ #define QLALR_NO_CHECK_SORTED_TABLE -struct _Fit: public std::binary_function<int, int, bool> +struct _Fit { inline bool operator () (int a, int b) const { @@ -45,7 +45,7 @@ struct _Fit: public std::binary_function<int, int, bool> } }; -struct _PerfectMatch: public std::binary_function<int, int, bool> +struct _PerfectMatch { inline bool operator () (int a, int b) const { return a == b; } @@ -135,7 +135,7 @@ private: const_iterator _M_endNonZeros; }; -struct _SortUncompressedRow: public std::binary_function<UncompressedRow, UncompressedRow, bool> +struct _SortUncompressedRow { inline bool operator () (const UncompressedRow &a, const UncompressedRow &b) const { return a.count (0) > b.count (0); } diff --git a/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp index 00597d1379..ec960925aa 100644 --- a/src/tools/qlalr/lalr.cpp +++ b/src/tools/qlalr/lalr.cpp @@ -242,8 +242,9 @@ void Grammar::buildExtendedGrammar () non_terminals.insert (accept_symbol); } -struct Nullable: public std::unary_function<Name, bool> +struct Nullable { + typedef Name argument_type; Automaton *_M_automaton; Nullable (Automaton *aut): |