Mercurial > hg > svgui

changeset 1359:e7da9c9635ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Thu, 11 Oct 2018 18:26:45 +0100
parents 53fe33b00770 (diff) 93eaff6f206d (current diff)
children 2e3b3fadba27
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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);
     }