diff --git a/d00/ex00/megaphone b/d00/ex00/megaphone index 9cb0d3b..b2f63e0 100755 Binary files a/d00/ex00/megaphone and b/d00/ex00/megaphone differ diff --git a/d01/ex06/Makefile b/d01/ex06/Makefile index 43d12d0..e849504 100644 --- a/d01/ex06/Makefile +++ b/d01/ex06/Makefile @@ -6,8 +6,8 @@ NAME = karenFilter -CC = clang++ -CFLAGS = -Wall -Wextra -Werror $(INCLUDES) -std=c++98 -g3 +CC = c++ +CFLAGS = -Wall -Wextra -Werror $(INCLUDES) -std=c++98 VPATH = $(D_SRCS) diff --git a/d01/ex06/karenFilter b/d01/ex06/karenFilter index 00922f7..d9ab0c3 100755 Binary files a/d01/ex06/karenFilter and b/d01/ex06/karenFilter differ diff --git a/d02/ex02/fixed b/d02/ex02/fixed index 2dddd21..69fcc15 100755 Binary files a/d02/ex02/fixed and b/d02/ex02/fixed differ diff --git a/d02/ex02/main.cpp b/d02/ex02/main.cpp index 26ecbfe..fb6ddb0 100644 --- a/d02/ex02/main.cpp +++ b/d02/ex02/main.cpp @@ -3,18 +3,6 @@ int main( void ) { - Fixed a(10); - Fixed b(5); - Fixed c; - - std::cout << "a: " << a << '\n'; - std::cout << "b: " << b << '\n'; - if (a < b) - c = a; - else - c = b; - std::cout << "c: " << c << '\n'; - // Fixed a; // Fixed const b( Fixed( 5.05f ) * Fixed( 2 ) ); // @@ -28,5 +16,17 @@ int main( void ) { // // std::cout << Fixed::max( a, b ) << std::endl + Fixed c(10); + Fixed d(5); + Fixed e; + + std::cout << "c: " << d << '\n'; + std::cout << "d: " << c << '\n'; + if (c < d) + e = c; + else + e = d; + std::cout << "e: " << e << '\n'; + return 0; }