alexander
/
geekbrains_oop_cpp
1
0
Fork 0
Code Issues Pull Requests 8 Projects Releases Wiki Activity

edit exercise 2

This commit is contained in:
Alexander Zhirov 2021-06-23 14:30:00 +03:00
parent 6c7f00e7f7 e9026cb63d
commit 6eef022643
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lesson_2/main.cpp
View File

@ -9,6 +9,7 @@ int Student::count = 0;
int main()
{
<<<<<<< HEAD
vector<Student> students;
students.emplace_back("Олег", 20, GENDER_MALE, 75.2, 2020);
@ -19,6 +20,21 @@ int main()
students.emplace_back("Анастасия", 20, GENDER_FEMALE, 55.2, 2020);
students.emplace_back("Ольга", 21, GENDER_FEMALE, 49.3, 2020);
students.emplace_back("Владимир", 19, GENDER_MALE, 69.9, 2020);
=======
// Exercise 1
Student students[] =
{
Student("Олег", 20, GENDER_MALE, 75.2, 2020),
Student("Андрей", 19, GENDER_MALE, 72.8, 2020),
Student("Анастасия", 20, GENDER_FEMALE, 55.2, 2020),
Student("Ольга", 21, GENDER_FEMALE, 49.3, 2020),
Student("Владимир", 19, GENDER_MALE, 69.9, 2020)
};
students[0].printInfo();
students[2].printInfo();
>>>>>>> e9026cb63dde16cf8340ce3ff1a35ea7d0cc0045
Student::printCount();
@ -61,24 +77,3 @@ int main()
return 0;
}