Merge branch 'master' of https://git.ik.bme.hu/Prog2/ell_feladat/CppMonoton

248b37d2 · Szeberényi Imre · 8c616251 · 5e7d6bc5 · 248b37d2 · 8c616251
Commit 248b37d2 authored Apr 23, 2019 by Szeberényi Imre
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 6 deletions

Makefile
+17 -0

monoton.hpp
+0 -6

No files found.
--- a/Makefile
+++ b/Makefile
+#
+# Makefile a CppMonoton feladathoz
+#
+
+CXXFLAGS = -g -Wall 
+
+OBJS = monoton_test.o
+
+monoton_test: $(OBJS)
+	$(CXX) $(CXXFLAGS) $(OBJS) -o $@
+
+#-------------
+monoton_test.o: monoton_test.cpp fancy_iterators.hpp monoton.hpp gtest_lite.h
+
+clean:
+	rm -f *.o *.log monoton_test
+
--- a/monoton.hpp
+++ b/monoton.hpp
-#ifndef MONOTON_HPP
-#define MONOTON_HPP
-
-#error "Itt készitse el a monoton sablont!"
-
-#endif // MONOTON_HPP