logistic-bot/cpp02
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(norm): remove usage of friend

Browse source
This commit is contained in:
Khaïs COLIN 2025-05-20 13:34:30 +02:00
parent b4f48cdfb0
commit dc57ca2395
Signed by: logistic-bot
SSH key fingerprint: SHA256:RlpiqKeXpcPFZZ4y9Ou4xi2M8OhRJovIwDlbCaMsuAo
5 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ex01/Fixed.hpp
View file

@ -20,11 +20,11 @@ public:
std::string toBin(void) const; std::string toBin(void) const;
friend std::ostream &operator<<(std::ostream &stream, const Fixed &fixed);
private: private:
int value; int value;
static const int fracbits; static const int fracbits;
}; };
std::ostream &operator<<(std::ostream &stream, const Fixed &fixed);
#endif #endif

4
ex02/Fixed.hpp
View file

@ -41,11 +41,11 @@ public:
static Fixed &max(Fixed &left, Fixed &right); static Fixed &max(Fixed &left, Fixed &right);
static const Fixed &max(const Fixed &left, const Fixed &right); static const Fixed &max(const Fixed &left, const Fixed &right);
friend std::ostream &operator<<(std::ostream &stream, const Fixed &fixed);
private: private:
int value; int value;
static const int fracbits; static const int fracbits;
}; };
std::ostream &operator<<(std::ostream &stream, const Fixed &fixed);
#endif #endif

4
ex03/Fixed.hpp
View file

@ -43,11 +43,11 @@ public:
Fixed abs() const; Fixed abs() const;
friend std::ostream &operator<<(std::ostream &stream, const Fixed &fixed);
private: private:
int value; int value;
static const int fracbits; static const int fracbits;
}; };
std::ostream &operator<<(std::ostream &stream, const Fixed &fixed);
#endif #endif

5
ex03/Point.cpp
View file

@ -13,12 +13,15 @@ Point &Point::operator=(const Point &other) {
}; };
Point::~Point() {} Point::~Point() {}
Fixed Point::getX() const { return x; }
Fixed Point::getY() const { return y; }
Fixed Point::triangleArea(Point const &a, Point const &b, Point const &c) { Fixed Point::triangleArea(Point const &a, Point const &b, Point const &c) {
return (((a.x * (b.y - c.y)) + (b.x * (c.y - a.y)) + (c.x * (a.y - b.y))) / 2) return (((a.x * (b.y - c.y)) + (b.x * (c.y - a.y)) + (c.x * (a.y - b.y))) / 2)
.abs(); .abs();
} }
std::ostream &operator<<(std::ostream &stream, const Point &p) { std::ostream &operator<<(std::ostream &stream, const Point &p) {
stream << "(" << p.x << ", " << p.y << ")"; stream << "(" << p.getX() << ", " << p.getY() << ")";
return stream; return stream;
} }

7
ex03/Point.hpp
View file

@ -15,11 +15,14 @@ public:
Point &operator=(const Point &other); Point &operator=(const Point &other);
~Point(); ~Point();
static Fixed triangleArea(Point const &a, Point const &b, Point const &c); Fixed getX() const;
Fixed getY() const;
friend std::ostream &operator<<(std::ostream &stream, const Point &point); static Fixed triangleArea(Point const &a, Point const &b, Point const &c);
}; };
std::ostream &operator<<(std::ostream &stream, const Point &point);
bool bsp(Point const a, Point const b, Point const c, Point const point); bool bsp(Point const a, Point const b, Point const c, Point const point);
#endif #endif