Add std:: prefixes to all shuffle calls. Use unique_ptr instead of shared_ptr.

This commit is contained in:
Brian Phlipot
2022-10-03 16:21:19 -07:00
committed by teejusb
parent 95e55f5cdd
commit a0e805e511
7 changed files with 16 additions and 17 deletions
+2 -2
View File
@@ -368,7 +368,7 @@ static void CourseSortSongs( SongSort sort, std::vector<Song*> &vpPossibleSongs,
{
DEFAULT_FAIL(sort);
case SongSort_Randomize:
shuffle( vpPossibleSongs.begin(), vpPossibleSongs.end(), rnd );
std::shuffle( vpPossibleSongs.begin(), vpPossibleSongs.end(), rnd );
break;
case SongSort_MostPlays:
if( PROFILEMAN )
@@ -428,7 +428,7 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
* will change every time it's viewed, and the displayed order will have no
* bearing on what you'll actually play. */
tmp_entries = m_vEntries;
shuffle( tmp_entries.begin(), tmp_entries.end(), rnd );
std::shuffle( tmp_entries.begin(), tmp_entries.end(), rnd );
}
const std::vector<CourseEntry> &entries = m_bShuffle ? tmp_entries:m_vEntries;