Ticket #3184: filezilla-02-vector-begin.diff

trunk/src/interface/RemoteListView.cpp

@@ -1017 +1017 @@
         // Simply reverse everything
         m_sortDirection = direction;
         m_sortColumn = column;
-        std::reverse(++m_indexMapping.begin(), m_indexMapping.end());
+        std::vector<unsigned int>::iterator iter;
+        iter = m_indexMapping.begin();
+        std::reverse(++iter, m_indexMapping.end());
 
         SortList_UpdateSelections(selected, focused);
         delete [] selected;
@@ -1053 +1055 @@
         break;
     }
 
+    std::vector<unsigned int>::iterator iter;
+    iter = m_indexMapping.begin();
     if (!m_sortColumn)
-        std::sort(++m_indexMapping.begin(), m_indexMapping.end(), CRemoteListViewSortName(m_pDirectoryListing, dirSortMode));
+        std::sort(++iter, m_indexMapping.end(), CRemoteListViewSortName(m_pDirectoryListing, dirSortMode));
     else if (m_sortColumn == 1)
-        std::sort(++m_indexMapping.begin(), m_indexMapping.end(), CRemoteListViewSortSize(m_pDirectoryListing, dirSortMode));
+        std::sort(++iter, m_indexMapping.end(), CRemoteListViewSortSize(m_pDirectoryListing, dirSortMode));
     else if (m_sortColumn == 2)
-        std::sort(++m_indexMapping.begin(), m_indexMapping.end(), CRemoteListViewSortType(this, dirSortMode, m_pDirectoryListing, m_fileData));
+        std::sort(++iter, m_indexMapping.end(), CRemoteListViewSortType(this, dirSortMode, m_pDirectoryListing, m_fileData));
     else if (m_sortColumn == 3)
-        std::sort(++m_indexMapping.begin(), m_indexMapping.end(), CRemoteListViewSortTime(m_pDirectoryListing, dirSortMode));
+        std::sort(++iter, m_indexMapping.end(), CRemoteListViewSortTime(m_pDirectoryListing, dirSortMode));
     else if (m_sortColumn == 4)
-        std::sort(++m_indexMapping.begin(), m_indexMapping.end(), CRemoteListViewSortPermissions(m_pDirectoryListing, dirSortMode));
+        std::sort(++iter, m_indexMapping.end(), CRemoteListViewSortPermissions(m_pDirectoryListing, dirSortMode));
     
+    iter = m_indexMapping.begin();
     if (m_sortDirection)
-        std::reverse(++m_indexMapping.begin(), m_indexMapping.end());
+        std::reverse(++iter, m_indexMapping.end());
 
     SortList_UpdateSelections(selected, focused);
     delete [] selected;