From 1d817947d6d04e3b022c4f50919e27dcebd56248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Rosa?= <w65567@student.wsiz.edu.pl>
Date: Tue, 26 Apr 2022 15:07:36 +0200
Subject: [PATCH] 5_5 & 5_6

---
 .../{ConsoleApplication1.cpp => 5_4.cpp}      |  0
 ConsoleApplication1/5_5.cpp                   | 14 +++++++++
 ConsoleApplication1/5_6.cpp                   | 29 +++++++++++++++++++
 .../ConsoleApplication1.vcxproj               |  4 ++-
 .../ConsoleApplication1.vcxproj.filters       |  8 ++++-
 5 files changed, 53 insertions(+), 2 deletions(-)
 rename ConsoleApplication1/{ConsoleApplication1.cpp => 5_4.cpp} (100%)
 create mode 100644 ConsoleApplication1/5_5.cpp
 create mode 100644 ConsoleApplication1/5_6.cpp

diff --git a/ConsoleApplication1/ConsoleApplication1.cpp b/ConsoleApplication1/5_4.cpp
similarity index 100%
rename from ConsoleApplication1/ConsoleApplication1.cpp
rename to ConsoleApplication1/5_4.cpp
diff --git a/ConsoleApplication1/5_5.cpp b/ConsoleApplication1/5_5.cpp
new file mode 100644
index 0000000..c24fc6e
--- /dev/null
+++ b/ConsoleApplication1/5_5.cpp
@@ -0,0 +1,14 @@
+#include <iostream>
+#include <string>
+
+using namespace std;
+
+template<class T>
+
+T maxx(T a, T b) {
+	return a > b ? a : b;
+}
+
+int main() {
+	cout << maxx("bdc", "bcd");
+}
\ No newline at end of file
diff --git a/ConsoleApplication1/5_6.cpp b/ConsoleApplication1/5_6.cpp
new file mode 100644
index 0000000..1e1e69c
--- /dev/null
+++ b/ConsoleApplication1/5_6.cpp
@@ -0,0 +1,29 @@
+#include <iostream>
+#include <vector>
+
+using namespace std;
+
+template<class T, class T1>
+
+T wypiszTablice(vector<T> tab, T1 a) {
+	//cout << sizeof(tab);
+	for (int i = 0; i < tab.size(); i++) {
+		cout << tab[i] << " ";
+	}
+
+	cout << endl;
+
+	return tab[a];
+}
+
+int main() {
+	vector<int> tab1 = {2, 3, 7, 11, 17};
+	vector<double> tab2 = { 3.14, 6.11, 7.87, 11.21, 19.91 };
+	vector<char> tab3 = { 'A', 'B', 'c', 'X', '5' };
+
+	//cout << sizeof(tab1);
+
+	cout << wypiszTablice(tab1, 2) << endl;
+	cout << wypiszTablice(tab2, 2) << endl;
+	cout << wypiszTablice(tab3, 2) << endl;
+}
\ No newline at end of file
diff --git a/ConsoleApplication1/ConsoleApplication1.vcxproj b/ConsoleApplication1/ConsoleApplication1.vcxproj
index 169a58f..8428684 100644
--- a/ConsoleApplication1/ConsoleApplication1.vcxproj
+++ b/ConsoleApplication1/ConsoleApplication1.vcxproj
@@ -139,7 +139,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="ConsoleApplication1.cpp" />
+    <ClCompile Include="5_5.cpp" />
+    <ClCompile Include="5_4.cpp" />
+    <ClCompile Include="5_6.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/ConsoleApplication1/ConsoleApplication1.vcxproj.filters b/ConsoleApplication1/ConsoleApplication1.vcxproj.filters
index 6713fa5..18c38ab 100644
--- a/ConsoleApplication1/ConsoleApplication1.vcxproj.filters
+++ b/ConsoleApplication1/ConsoleApplication1.vcxproj.filters
@@ -15,7 +15,13 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="ConsoleApplication1.cpp">
+    <ClCompile Include="5_4.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="5_5.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="5_6.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>