diff --git a/lesson_2/exercise_1.hpp b/lesson_2/exercise_1.hpp index 65a5399..29fd2bf 100644 --- a/lesson_2/exercise_1.hpp +++ b/lesson_2/exercise_1.hpp @@ -74,6 +74,13 @@ public: count++; } + Student(const Student &s) : Person(s) + { + count++; + + m_yos = s.m_yos; + } + static void printCount() { std::cout << "Количество студентов: " << count << std::endl; diff --git a/lesson_2/main.cpp b/lesson_2/main.cpp index fb554e1..e9935a3 100644 --- a/lesson_2/main.cpp +++ b/lesson_2/main.cpp @@ -9,17 +9,16 @@ int Student::count = 0; int main() { - 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) - }; + vector students; - students[0].printInfo(); - students[2].printInfo(); + students.emplace_back("Олег", 20, GENDER_MALE, 75.2, 2020); + students.emplace_back("Андрей", 19, GENDER_MALE, 72.8, 2020); + + Student::printCount(); + + 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); Student::printCount();