# HG changeset patch
# User Chris Cannam
# Date 1539278805 -3600
# Node ID e7da9c9635ba053aa30bcd6c170559b68ba87aa1
# Parent  53fe33b00770c55d94068bd7ad3b7804bc4adbdf# Parent  93eaff6f206db93197389c71b8a6c1432a4f94f6
Merge

diff -r 93eaff6f206d -r e7da9c9635ba widgets/SubdividingMenu.cpp
--- a/widgets/SubdividingMenu.cpp	Thu Oct 11 14:59:34 2018 +0100
+++ b/widgets/SubdividingMenu.cpp	Thu Oct 11 18:26:45 2018 +0100
@@ -85,7 +85,7 @@
                           return QString::localeAwareCompare(s1, s2) < 0;
                       };
     
-    set<QString, typeof(comparator)> sortedEntries(comparator);
+    set<QString, decltype(comparator)> sortedEntries(comparator);
     sortedEntries.insert(entries.begin(), entries.end());
     
     for (auto j = sortedEntries.begin(); j != sortedEntries.end(); ++j) {
@@ -180,7 +180,7 @@
     auto comparator = [](QString s1, QString s2) -> bool {
                           return QString::localeAwareCompare(s1, s2) < 0;
                       };
-    set<QString, typeof(comparator)> sortedEntries(comparator);
+    set<QString, decltype(comparator)> sortedEntries(comparator);
     for (auto i: m_pendingEntries) {
         sortedEntries.insert(i.first);
     }