diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2020-11-17 16:51:56 +0100 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2020-11-17 16:51:56 +0100 |
| commit | a92013c92bfcd50b0e2561280c9eaa604843ade0 (patch) | |
| tree | b617be1b683acfccbb93162945e3cb1dd8171aac /cpp00 | |
| parent | 331c3596660fed6c8b04fdfd0a89435ccffaaf20 (diff) | |
| download | piscine_cpp-a92013c92bfcd50b0e2561280c9eaa604843ade0.tar.gz piscine_cpp-a92013c92bfcd50b0e2561280c9eaa604843ade0.tar.bz2 piscine_cpp-a92013c92bfcd50b0e2561280c9eaa604843ade0.zip | |
Fixing missleading indentation error from clang++ on Linux
Diffstat (limited to 'cpp00')
| -rw-r--r-- | cpp00/ex00/Makefile | 17 | ||||
| -rw-r--r-- | cpp00/ex01/PhoneBook.cpp | 4 |
2 files changed, 9 insertions, 12 deletions
diff --git a/cpp00/ex00/Makefile b/cpp00/ex00/Makefile index 2bfc080..668507b 100644 --- a/cpp00/ex00/Makefile +++ b/cpp00/ex00/Makefile @@ -6,32 +6,27 @@ # By: cacharle <me@cacharle.xyz> +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2020/11/09 09:16:44 by cacharle #+# #+# # -# Updated: 2020/11/09 09:16:45 by cacharle ### ########.fr # +# Updated: 2020/11/17 16:41:44 by charles ### ########.fr # # # # ############################################################################ # RM = rm -f -CC = clang++ -CCFLAGS = -Wall -Wextra -Werror +CXX = clang++ +CXXFLAGS = -Wall -Wextra -Werror NAME = megaphone SRC = megaphone.cpp -OBJ = $(SRC:.cpp=.o) all: $(NAME) -$(NAME): $(OBJ) - $(CC) $(CCFLAGS) -o $@ $^ - -%.o: %.c - $(CC) $(CCFLAGS) -o $@ $< +$(NAME): $(SRC) + $(CXX) $(CXXFLAGS) -o $@ $^ clean: - $(RM) $(OBJ) + $(RM) $(NAME) fclean: clean - $(RM) $(NAME) re: fclean all diff --git a/cpp00/ex01/PhoneBook.cpp b/cpp00/ex01/PhoneBook.cpp index 7ce3df0..2219cee 100644 --- a/cpp00/ex01/PhoneBook.cpp +++ b/cpp00/ex01/PhoneBook.cpp @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/13 07:23:13 by charles #+# #+# */ -/* Updated: 2020/11/09 12:33:21 by cacharle ### ########.fr */ +/* Updated: 2020/11/17 16:42:33 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,7 +17,9 @@ PhoneBook::PhoneBook() : m_size(0) {} void PhoneBook::add(Contact contact) { if (m_size >= CONTACTS_SIZE) + { return; + } m_contacts[m_size] = contact; m_size++; } |