Compare commits

..

No commits in common. "6eef0226435c74f0005cb69d79adfee9b1caae1c" and "e9026cb63dde16cf8340ce3ff1a35ea7d0cc0045" have entirely different histories.

2 changed files with 0 additions and 20 deletions

View File

@ -74,13 +74,6 @@ public:
count++; count++;
} }
Student(const Student &s) : Person(s)
{
count++;
m_yos = s.m_yos;
}
static void printCount() static void printCount()
{ {
std::cout << "Количество студентов: " << count << std::endl; std::cout << "Количество студентов: " << count << std::endl;

View File

@ -9,18 +9,6 @@ int Student::count = 0;
int main() int main()
{ {
<<<<<<< HEAD
vector<Student> students;
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);
=======
// Exercise 1 // Exercise 1
Student students[] = Student students[] =
@ -34,7 +22,6 @@ int main()
students[0].printInfo(); students[0].printInfo();
students[2].printInfo(); students[2].printInfo();
>>>>>>> e9026cb63dde16cf8340ce3ff1a35ea7d0cc0045
Student::printCount(); Student::printCount();