diff --git a/cpp09/ex02/PmergeMe.cpp b/cpp09/ex02/PmergeMe.cpp index 1c26267..02d6c47 100644 --- a/cpp09/ex02/PmergeMe.cpp +++ b/cpp09/ex02/PmergeMe.cpp @@ -6,34 +6,8 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/01 14:45:19 by rparodi #+# #+# */ -/* Updated: 2025/05/07 12:02:56 by rparodi ### ########.fr */ +/* Updated: 2025/05/07 12:56:12 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ #include "PmergeMe.hpp" -#include - -PmergeMe::PmergeMe() { - std::cout << CLR_GREEN << "Default constructor called" << CLR_RESET << std::endl; -} - -PmergeMe::~PmergeMe() { - std::cout << CLR_MAGENTA << "Destructor called" << CLR_RESET << std::endl; -} - -PmergeMe::PmergeMe(const PmergeMe ©) : _vec(copy._vec) { - std::cout << CLR_GREEN << "Copy constructor called" << CLR_RESET << std::endl; -} - -PmergeMe::PmergeMe(std::vector vec) : _vec(vec) { - std::cout << CLR_GREEN << "Constructor with vector called" << CLR_RESET << std::endl; -} - -PmergeMe& PmergeMe::operator=(const PmergeMe &assign) { - std::cout << CLR_GREEN << "Copy assignment operator called" << CLR_RESET << std::endl; - if (this != &assign) { - this->_vec = assign._vec; - } - return *this; -} - diff --git a/cpp09/ex02/PmergeMe.hpp b/cpp09/ex02/PmergeMe.hpp index 59a2ec9..98cfdd3 100644 --- a/cpp09/ex02/PmergeMe.hpp +++ b/cpp09/ex02/PmergeMe.hpp @@ -6,29 +6,21 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/01 14:45:25 by rparodi #+# #+# */ -/* Updated: 2025/05/07 11:58:03 by rparodi ### ########.fr */ +/* Updated: 2025/05/07 14:56:58 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ #pragma once +#include #include #include #include #include +#include +#include #include -class PmergeMe { - private: - std::vector _vec; - public: - PmergeMe(); - PmergeMe(const PmergeMe ©); - PmergeMe& operator=(const PmergeMe &assign); - PmergeMe(std::vector vec); - ~PmergeMe(); -}; - #define CLR_RESET "\033[0m" #define CLR_BLACK "\033[0;30m"