Commit 9e98bd17 authored by Andrew J Zhou's avatar Andrew J Zhou
Browse files

Merge branch 'fix_mac' into 'master'

Fixed compilation issue on Mac

See merge request eecs281/lab-1-music-sorting!1
parents 75616103 334d14e3
......@@ -261,7 +261,7 @@ void MusicLibrary::read_data() {
// Reserve the exact amount of memory needed
// to fit all the songs.
music.reserve(num_songs);
music.reserve(size_t(num_songs));
// Read to the end of the CSV file.
while (std::getline(std::cin, song.name, ',')) {
......@@ -314,7 +314,7 @@ void MusicLibrary::run() {
// Print out the first num_print songs with the
// overloaded stream insertion operator.
for (int i = 0; i < num_print; ++i)
std::cout << music[i] << std::endl;
std::cout << music[size_t(i)] << std::endl;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment