diff options
Diffstat (limited to 'cpp04')
| -rw-r--r-- | cpp04/ex02/Squad.cpp | 6 | ||||
| -rw-r--r-- | cpp04/ex03/MateriaSource.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cpp04/ex02/Squad.cpp b/cpp04/ex02/Squad.cpp index ba825b9..11c7862 100644 --- a/cpp04/ex02/Squad.cpp +++ b/cpp04/ex02/Squad.cpp @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/14 15:08:35 by charles #+# #+# */ -/* Updated: 2020/04/14 15:54:17 by charles ### ########.fr */ +/* Updated: 2020/04/15 10:06:04 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -43,13 +43,13 @@ int Squad::getCount() const ISpaceMarine* Squad::getUnit(int n) const { if (n < 0 || n >= m_size) - return nullptr; + return NULL; return m_units[n]; } int Squad::push(ISpaceMarine* spaceMarine) { - if (spaceMarine == nullptr) + if (spaceMarine == NULL) return (-1); for (int i = 0; i < m_size; i++) if (m_units[i] == spaceMarine) diff --git a/cpp04/ex03/MateriaSource.cpp b/cpp04/ex03/MateriaSource.cpp index bce6e5a..f5aaf60 100644 --- a/cpp04/ex03/MateriaSource.cpp +++ b/cpp04/ex03/MateriaSource.cpp @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/14 17:19:10 by charles #+# #+# */ -/* Updated: 2020/04/14 17:51:07 by charles ### ########.fr */ +/* Updated: 2020/04/15 10:05:47 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -39,5 +39,5 @@ void MateriaSource::learnMateria(AMateria* materia) AMateria* MateriaSource::createMateria(std::string const& type) { - return nullptr; + return NULL; } |