comparison widgets/SubdividingMenu.cpp @ 1374:631897ba9fca zoom

Merge from default branch

 
     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);
     sortedEntries.insert(entries.begin(), entries.end());
     
     for (auto j = sortedEntries.begin(); j != sortedEntries.end(); ++j) {
 
 #ifdef DEBUG_SUBDIVIDING_MENU

     // again, for the set passed to it, but we need the same sorting
     // for the subsequent loop in this function as well)
     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);
     }
     
     for (QString entry: sortedEntries) {