Add files via upload

5 files changed, 13 insertions, 6 deletions

diff --git a/Big4AndInheritance/Students/GradesBook.cpp b/Big4AndInheritance/Students/GradesBook.cpp
index 0c04b83..759a63c 100644
--- a/Big4AndInheritance/Students/GradesBook.cpp
+++ b/Big4AndInheritance/Students/GradesBook.cpp
@@ -9,7 +9,7 @@ GradesBook::GradesBook()
 }

 GradesBook::GradesBook(const GradesBook& other)

 {

-	cout << "Copy contr of GradesBook" << endl;

+	std::cout << "Copy contr of GradesBook" << std::endl;

 	CopyFrom(other);

 }

 GradesBook& GradesBook::operator=(const GradesBook& other)

@@ -78,7 +78,7 @@ int GradesBook::operator[](int index) const
 	return grades[index];

 }

 

-ostream& operator<<(ostream& stream, GradesBook& obj)

+std::ostream& operator<<(std::ostream& stream, GradesBook& obj)

 {

 	for (int i = 0; i < obj.capacity; i++)

 	{

diff --git a/Big4AndInheritance/Students/GradesBook.h b/Big4AndInheritance/Students/GradesBook.h
index c9ba8e9..e1dd262 100644
--- a/Big4AndInheritance/Students/GradesBook.h
+++ b/Big4AndInheritance/Students/GradesBook.h
@@ -1,3 +1,6 @@
+#pragma once

+#include <iostream>

+

 class GradesBook

 {

 	int* grades;

@@ -19,6 +22,6 @@ public:
 	void RemoveLastGrade();

 	

 	int operator[](int index) const;

-	friend ostream& operator<<(ostream& stream, GradesBook& obj);

+	friend std::ostream& operator<<(std::ostream& stream, GradesBook& obj);

 

 };

diff --git a/Big4AndInheritance/Students/Student.cpp b/Big4AndInheritance/Students/Student.cpp
index c7180c8..e3d5f06 100644
--- a/Big4AndInheritance/Students/Student.cpp
+++ b/Big4AndInheritance/Students/Student.cpp
@@ -6,5 +6,5 @@ Student::Student(const char* name, int age, int fn): User(name,age)
 

 void Student::ReceiveGrade(int grade)

 {

-	book.AddGrade(grade);

+	b.AddGrade(grade);

 }
\ No newline at end of file
diff --git a/Big4AndInheritance/Students/Student.h b/Big4AndInheritance/Students/Student.h
index 4921a5d..45a103d 100644
--- a/Big4AndInheritance/Students/Student.h
+++ b/Big4AndInheritance/Students/Student.h
@@ -1,4 +1,6 @@
+#pragma once

 #include "User.h"

+#include "GradesBook.h"

 

 class Student : public User

 {

@@ -7,7 +9,7 @@ public:
 	GradesBook b;

 

 	Student(const char* name, int age, int fn);

-	void ReceiveGrade(int grade)

+	void ReceiveGrade(int grade);

 	

 

-};
\ No newline at end of file
+};

diff --git a/Big4AndInheritance/Students/User.h b/Big4AndInheritance/Students/User.h
index c466ef4..d84bd71 100644
--- a/Big4AndInheritance/Students/User.h
+++ b/Big4AndInheritance/Students/User.h
@@ -1,3 +1,5 @@
+#pragma once

+

 #include <iostream>

 using namespace std;

 class User