diff options
Diffstat (limited to 'cpp02/ex01')
| -rw-r--r-- | cpp02/ex01/Fixed.cpp | 2 | ||||
| -rw-r--r-- | cpp02/ex01/Fixed.hpp | 10 | ||||
| -rw-r--r-- | cpp02/ex01/main_DO_NOT_TURN_ME_IN.cpp (renamed from cpp02/ex01/main.cpp) | 7 |
3 files changed, 9 insertions, 10 deletions
diff --git a/cpp02/ex01/Fixed.cpp b/cpp02/ex01/Fixed.cpp index 14ba1c6..759807b 100644 --- a/cpp02/ex01/Fixed.cpp +++ b/cpp02/ex01/Fixed.cpp @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/13 11:45:18 by charles #+# #+# */ -/* Updated: 2020/11/09 13:11:29 by cacharle ### ########.fr */ +/* Updated: 2020/11/10 09:59:45 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/cpp02/ex01/Fixed.hpp b/cpp02/ex01/Fixed.hpp index 1f768f6..43edba2 100644 --- a/cpp02/ex01/Fixed.hpp +++ b/cpp02/ex01/Fixed.hpp @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/13 11:40:49 by charles #+# #+# */ -/* Updated: 2020/11/09 13:11:15 by cacharle ### ########.fr */ +/* Updated: 2020/11/10 10:02:06 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -27,13 +27,11 @@ public: Fixed(const int from); Fixed(const float from); - int getRawBits() const; - void setRawBits(int const raw); - int getRawBits() const; void setRawBits(int const raw); - float toFloat() const; - int toInt() const; + + float toFloat(void) const; // void asked by subject + int toInt(void) const; static int getFractionalBits(); diff --git a/cpp02/ex01/main.cpp b/cpp02/ex01/main_DO_NOT_TURN_ME_IN.cpp index 34d365a..f2eb5e0 100644 --- a/cpp02/ex01/main.cpp +++ b/cpp02/ex01/main_DO_NOT_TURN_ME_IN.cpp @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* main.cpp :+: :+: :+: */ +/* main_DO_NOT_TURN_ME_IN.cpp :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/13 11:51:15 by charles #+# #+# */ -/* Updated: 2020/10/19 11:28:50 by cacharle ### ########.fr */ +/* Updated: 2020/11/10 10:00:32 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,12 +15,13 @@ int main(void) { - Fixed a; + Fixed a; Fixed const b(10); Fixed const c(42.42f); Fixed const d(b); a = Fixed(1234.4321f); + std::cout << "a is " << a << std::endl; std::cout << "b is " << b << std::endl; std::cout << "c is " << c << std::endl; |