From d1a4d6c087bad6d950c92e0ffa8df6497872af8b Mon Sep 17 00:00:00 2001 From: Tin Serdar Date: Mon, 12 Nov 2018 18:51:17 +0100 Subject: [PATCH 1/2] Rijesenja --- exercise/01/app/app.cpp | Bin 0 -> 4626 bytes exercise/01/app/app.vcxproj | 212 +++++++++++++++++++++++ exercise/01/app/app.vcxproj.filters | 30 ++++ exercise/01/app/pch.cpp | Bin 0 -> 430 bytes exercise/01/app/pch.h | Bin 0 -> 1262 bytes exercise/01/dll1/dynamic_library.vcxproj | 12 +- exercise/01/e01.sln | 26 +-- exercise/02/code.cpp | 18 ++ exercise/02/code.h | 2 + exercise/02/test1.cpp | 6 +- 10 files changed, 286 insertions(+), 20 deletions(-) create mode 100644 exercise/01/app/app.cpp create mode 100644 exercise/01/app/app.vcxproj create mode 100644 exercise/01/app/app.vcxproj.filters create mode 100644 exercise/01/app/pch.cpp create mode 100644 exercise/01/app/pch.h diff --git a/exercise/01/app/app.cpp b/exercise/01/app/app.cpp new file mode 100644 index 0000000000000000000000000000000000000000..2889376ce02bee493aaf1f6d340134f47238faa6 GIT binary patch literal 4626 zcmb_gTW=Fr5FVb8D)Ao<<{=57HBjh7NGl;oXe5(FA&8eqky&qCgRvuDN*mO_-uC-u zc6|2cO*q+`hRU|MPcOx)P)>SNJ57>OIIV*3RTN8Oa<^m$;85!&53#naBeB zN4WFd0=xKTOTOl-TS~FS`xI|SN|9jgL}qv%;=7N%0aSnBN@cm)7333EhAZBE@EGV$ z-lMb`b|rF8et_;>z4Q5j(xuRJiQUwx18Y*~m*DE?zWSa$)o>0S$d#J?vSw!od=fba z{}J>&2k#~B{FSy!aJm8Zj^)_~lzZ|`Z5jZ#Z?KvzC@e#mivSlWdq)Q$Z2@S$f?IhHr_L3*+e?FR7r zMB|i}^%NUs)C}uJ?b^A&1EPePm&z+p4>Zo_@J)Gl5Bd38-XrTzA;mCvzGtBB;p&6h zqM=jK!x46h1n(K`ZjtL$mf{*V@vr;Ic@@!VL&G$6y~{|wLJq9A(euK!9wB!EDB7jn z*E~5=PxbPAa1Q0X;A*o^Oy})FuD;dmu-aMmV7o?-A*Bgnx2}jIHF7K0Y1U>R>FYLf zHRe&Z1~kjrEE_4oKYx|-hN~HTJjZv{(oHq($PuDHqUl{NXnke}40%pk*YO(CgucJ) zC_h$3_O=9>;%_2i<;vrB@@}?P?K;rh&MH-*JxV+poO>BXN3dLV>-a^Tt6p~OydvC$ z+4`(>eEvIfb=2DQzI}(XT357egwA-CSD0dDca+!5t=GNHG9ud8MbBr19HDMA*ZSyl zBXmT@sO8>gJb%H8&ws3O3D!85u@f$FT_We?6mj}B z`s-S~d|O;>s{W*23v%}kV}blQ*?oj|tbI1y223X>a)|Z1f0}zZ`&(OgSkxq zc}4cKM%ibeu_(KpOgjNhK*ckwYcf~Q&9FudY!Bmrc9jwMu~Ca-wVqXoJd0cW#YQDe+-f;Vich&*r9WgnE(ob)}&Vl8dfiCrRtww#}wrYhrw z%6JQYZpn#qXSFv3nG1H_2W59OUrQr$NHk0W+X+E|W&pA?ZptslOhm282FR?-5qdWsxi&hxkb!&2tV u92nxF6{H&$a6Z7Q{TD-ok5|0-tBQ@s4)c;U9^3YhO@bI0s~( + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {4B18B8B5-D3AF-4CFD-A4D9-66B8DD7AF1A8} + Win32Proj + app + 10.0.17134.0 + + + + Application + true + v141 + Unicode + + + Application + false + v141 + true + Unicode + + + Application + true + v141 + Unicode + + + Application + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)$(Configuration)\$(Platform)\ + $(Configuration)\$(Platform)\ + + + true + $(SolutionDir)$(Configuration)\$(Platform)\ + $(Configuration)\$(Platform)\ + + + false + $(SolutionDir)$(Configuration)\$(Platform)\ + $(Configuration)\$(Platform)\ + + + false + $(SolutionDir)$(Configuration)\$(Platform)\ + $(Configuration)\$(Platform)\ + + + + Use + Level3 + Disabled + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + + + Console + true + ..\dll2\$(Platform)\$(Configuration)\dynamic_library_with_implib.lib;..\lib\$(Platform)\$(Configuration)\static_library.lib + + + copy /Y "C:\Users\u17c35\Documents\Visual Studio 2017\Projects\CppTecaj\day1\exercise\01\dll2\$(Platform)\$(Configuration)\dynamic_library_with_implib.dll" "C:\Users\u17c35\Documents\Visual Studio 2017\Projects\CppTecaj\day1\exercise\01\$(Platform)\$(Configuration) +copy /Y "C:\Users\u17c35\Documents\Visual Studio 2017\Projects\CppTecaj\day1\exercise\01\dll1\$(Platform)\$(Configuration)\dynamic_library.dll" "C:\Users\u17c35\Documents\Visual Studio 2017\Projects\CppTecaj\day1\exercise\01\$(Platform)\$(Configuration) + + + copy /Y "..\dll2\$(Platform)\$(Configuration)\dynamic_library_with_implib.dll" "..\$(Configuration)\$(Platform)" +copy /Y "..\dll1\$(Platform)\$(Configuration)\dynamic_library.dll" "..\$(Configuration)\$(Platform)\ + + + + + Use + Level3 + Disabled + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + + + Console + true + ..\dll2\$(Platform)\$(Configuration)\dynamic_library_with_implib.lib;..\lib\$(Platform)\$(Configuration)\static_library.lib + + + + + + + copy /Y "..\dll2\$(Platform)\$(Configuration)\dynamic_library_with_implib.dll" "..\$(Configuration)\$(Platform)" +copy /Y "..\dll1\$(Platform)\$(Configuration)\dynamic_library.dll" "..\$(Configuration)\$(Platform)\ + + + + + Use + Level3 + MaxSpeed + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + + + Console + true + true + true + ..\dll2\$(Platform)\$(Configuration)\dynamic_library_with_implib.lib;..\lib\$(Platform)\$(Configuration)\static_library.lib + + + + + + + copy /Y "..\dll2\$(Platform)\$(Configuration)\dynamic_library_with_implib.dll" "..\$(Configuration)\$(Platform)" +copy /Y "..\dll1\$(Platform)\$(Configuration)\dynamic_library.dll" "..\$(Configuration)\$(Platform)\ + + + + + Use + Level3 + MaxSpeed + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + + + Console + true + true + true + ..\dll2\$(Platform)\$(Configuration)\dynamic_library_with_implib.lib;..\lib\$(Platform)\$(Configuration)\static_library.lib + + + copy /Y "C:\Users\u17c35\Documents\Visual Studio 2017\Projects\CppTecaj\day1\exercise\01\dll2\$(Platform)\$(Configuration)\dynamic_library_with_implib.dll" "C:\Users\u17c35\Documents\Visual Studio 2017\Projects\CppTecaj\day1\exercise\01\$(Platform)\$(Configuration) +copy /Y "C:\Users\u17c35\Documents\Visual Studio 2017\Projects\CppTecaj\day1\exercise\01\dll1\$(Platform)\$(Configuration)\dynamic_library.dll" "C:\Users\u17c35\Documents\Visual Studio 2017\Projects\CppTecaj\day1\exercise\01\$(Platform)\$(Configuration) + + + copy /Y "..\dll2\$(Platform)\$(Configuration)\dynamic_library_with_implib.dll" "..\$(Configuration)\$(Platform)" +copy /Y "..\dll1\$(Platform)\$(Configuration)\dynamic_library.dll" "..\$(Configuration)\$(Platform)\ + + + + + + + + + Create + Create + Create + Create + + + + + + \ No newline at end of file diff --git a/exercise/01/app/app.vcxproj.filters b/exercise/01/app/app.vcxproj.filters new file mode 100644 index 0000000..45e6ae5 --- /dev/null +++ b/exercise/01/app/app.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/exercise/01/app/pch.cpp b/exercise/01/app/pch.cpp new file mode 100644 index 0000000000000000000000000000000000000000..a38f8a37da858b0e7a4a577210e923c883ac97f3 GIT binary patch literal 430 zcma)(OAdlS5JYQj;vFWsRoUwaJO;ubLXfO} ziM!*RK?b#&)PqF4LX~Q_GVq=g$>^{f<-{7@$r|ykmqm|MwtC_%l{t|TJS9Jpalvn} ztpC7C!Dg_+`-h+El+KlNtsDc|GOvyF+iK(A-j!r1ot!0T2mdlziM{46Ghg8k=#H+V zM?tLvNCnoo3Y&aHb%nm~4lL&e!^r!5 zY>)Yt7?F2lcmBR1+QK#-XGNr7XZ8fr!cn3lZ5^Y)vUSfD^AwDN*h^Lw&)lPx++47# zd)SAA*b{C}iSS;`84M~$v>AMrgP7FJ8+gu~LAukhS6*EOJ`b`OdG>3c0~t!sZmv>H zn*HLA@+(*ivq2}#QbRtnCS6sZB|bGHY13EaXpqYpyv1DpS76m1eTdT|r_t-78YQ1T z#<62u5HD*r_L~oQCI!E8@(t$Ve*GNp63pmTN&3$4QJrKBuD-fJIu~wfYrcy;aeoU( z{gpDyo!duDy%mVwzd3}ObITpQ?&R3*fD>2bk}TRUp!6E5gQ6*el=X_*#+Q5I8?Z>{ zRy|dAN-mZA&0pz!j#b}5FeyBGiKSg%o7_9|!S#V|#ttsxpDyDUbdaS$838ttrue $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + false true $(Platform)\$(Configuration)\ + false false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + false false $(Platform)\$(Configuration)\ + false @@ -104,7 +108,7 @@ - del $(TargetDir)\dynamic_library.lib + del $(TargetDir)dynamic_library.lib @@ -125,7 +129,7 @@ - del $(TargetDir)\dynamic_library.lib + del $(TargetDir)dynamic_library.lib @@ -150,7 +154,7 @@ - del $(TargetDir)\dynamic_library.lib + del $(TargetDir)dynamic_library.lib @@ -175,7 +179,7 @@ - del $(TargetDir)\dynamic_library.lib + del $(TargetDir)dynamic_library.lib diff --git a/exercise/01/e01.sln b/exercise/01/e01.sln index fb6ce37..9e1cb74 100644 --- a/exercise/01/e01.sln +++ b/exercise/01/e01.sln @@ -5,17 +5,17 @@ VisualStudioVersion = 15.0.28010.2036 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "static_library", "lib\static_library.vcxproj", "{990D865F-0DF2-40ED-8622-8DD0DB4A2128}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app", "app\app.vcxproj", "{843D77A9-6E04-4515-91D5-A010A5CDF8E0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_library", "dll1\dynamic_library.vcxproj", "{92DBD108-3D52-419D-BC33-217327A4AD9D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_library_with_implib", "dll2\dynamic_library_with_implib.vcxproj", "{4EA09877-C87B-489E-9F80-A921D8E66E46}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app", "app\app.vcxproj", "{4B18B8B5-D3AF-4CFD-A4D9-66B8DD7AF1A8}" ProjectSection(ProjectDependencies) = postProject {92DBD108-3D52-419D-BC33-217327A4AD9D} = {92DBD108-3D52-419D-BC33-217327A4AD9D} {990D865F-0DF2-40ED-8622-8DD0DB4A2128} = {990D865F-0DF2-40ED-8622-8DD0DB4A2128} {4EA09877-C87B-489E-9F80-A921D8E66E46} = {4EA09877-C87B-489E-9F80-A921D8E66E46} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_library", "dll1\dynamic_library.vcxproj", "{92DBD108-3D52-419D-BC33-217327A4AD9D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_library_with_implib", "dll2\dynamic_library_with_implib.vcxproj", "{4EA09877-C87B-489E-9F80-A921D8E66E46}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -32,14 +32,6 @@ Global {990D865F-0DF2-40ED-8622-8DD0DB4A2128}.Release|x64.Build.0 = Release|x64 {990D865F-0DF2-40ED-8622-8DD0DB4A2128}.Release|x86.ActiveCfg = Release|Win32 {990D865F-0DF2-40ED-8622-8DD0DB4A2128}.Release|x86.Build.0 = Release|Win32 - {843D77A9-6E04-4515-91D5-A010A5CDF8E0}.Debug|x64.ActiveCfg = Debug|x64 - {843D77A9-6E04-4515-91D5-A010A5CDF8E0}.Debug|x64.Build.0 = Debug|x64 - {843D77A9-6E04-4515-91D5-A010A5CDF8E0}.Debug|x86.ActiveCfg = Debug|Win32 - {843D77A9-6E04-4515-91D5-A010A5CDF8E0}.Debug|x86.Build.0 = Debug|Win32 - {843D77A9-6E04-4515-91D5-A010A5CDF8E0}.Release|x64.ActiveCfg = Release|x64 - {843D77A9-6E04-4515-91D5-A010A5CDF8E0}.Release|x64.Build.0 = Release|x64 - {843D77A9-6E04-4515-91D5-A010A5CDF8E0}.Release|x86.ActiveCfg = Release|Win32 - {843D77A9-6E04-4515-91D5-A010A5CDF8E0}.Release|x86.Build.0 = Release|Win32 {92DBD108-3D52-419D-BC33-217327A4AD9D}.Debug|x64.ActiveCfg = Debug|x64 {92DBD108-3D52-419D-BC33-217327A4AD9D}.Debug|x64.Build.0 = Debug|x64 {92DBD108-3D52-419D-BC33-217327A4AD9D}.Debug|x86.ActiveCfg = Debug|Win32 @@ -56,6 +48,14 @@ Global {4EA09877-C87B-489E-9F80-A921D8E66E46}.Release|x64.Build.0 = Release|x64 {4EA09877-C87B-489E-9F80-A921D8E66E46}.Release|x86.ActiveCfg = Release|Win32 {4EA09877-C87B-489E-9F80-A921D8E66E46}.Release|x86.Build.0 = Release|Win32 + {4B18B8B5-D3AF-4CFD-A4D9-66B8DD7AF1A8}.Debug|x64.ActiveCfg = Debug|x64 + {4B18B8B5-D3AF-4CFD-A4D9-66B8DD7AF1A8}.Debug|x64.Build.0 = Debug|x64 + {4B18B8B5-D3AF-4CFD-A4D9-66B8DD7AF1A8}.Debug|x86.ActiveCfg = Debug|Win32 + {4B18B8B5-D3AF-4CFD-A4D9-66B8DD7AF1A8}.Debug|x86.Build.0 = Debug|Win32 + {4B18B8B5-D3AF-4CFD-A4D9-66B8DD7AF1A8}.Release|x64.ActiveCfg = Release|x64 + {4B18B8B5-D3AF-4CFD-A4D9-66B8DD7AF1A8}.Release|x64.Build.0 = Release|x64 + {4B18B8B5-D3AF-4CFD-A4D9-66B8DD7AF1A8}.Release|x86.ActiveCfg = Release|Win32 + {4B18B8B5-D3AF-4CFD-A4D9-66B8DD7AF1A8}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/exercise/02/code.cpp b/exercise/02/code.cpp index 85e778c..e6670b6 100644 --- a/exercise/02/code.cpp +++ b/exercise/02/code.cpp @@ -1,2 +1,20 @@ #include "stdafx.h" #include "code.h" + +void f1(int* pa, int* pb) { + *pa += *pb; + *pb = *pa - *pb; + *pa -= *pb; +} + +void f2(int* startValuePointer, int* endValuePointer) { + if (startValuePointer && endValuePointer) + { + int iterateNum = endValuePointer - startValuePointer; + + for (int i = 0; i < iterateNum; ++i) + { + (*(startValuePointer + i))++; + } + } +} \ No newline at end of file diff --git a/exercise/02/code.h b/exercise/02/code.h index e69de29..90cdbcd 100644 --- a/exercise/02/code.h +++ b/exercise/02/code.h @@ -0,0 +1,2 @@ +void f1(int*, int*); +void f2(int*, int*); \ No newline at end of file diff --git a/exercise/02/test1.cpp b/exercise/02/test1.cpp index 33dfab7..b438420 100644 --- a/exercise/02/test1.cpp +++ b/exercise/02/test1.cpp @@ -14,14 +14,14 @@ namespace simple_test TEST_METHOD(f1_changes_values) { int a=1, b=2; - //f1(a, b); + f1(&a, &b); Assert::AreEqual(2, a); Assert::AreEqual(1, b); } TEST_METHOD(f2_increases_all_values_by_one) { int arr[] = { 1, 2, 3 }; - //f2(arr, arr+3); + f2(arr, arr+3); Assert::AreEqual(2, arr[0]); Assert::AreEqual(3, arr[1]); Assert::AreEqual(4, arr[2]); @@ -29,7 +29,7 @@ namespace simple_test TEST_METHOD(f2_works_for_different_number_of_values) { int arr[] = { 2, 4, 6, 8, 10 }; - //f2(arr, arr+5); + f2(arr, arr+5); Assert::AreEqual(3, arr[0]); Assert::AreEqual(5, arr[1]); Assert::AreEqual(7, arr[2]); From 9b258faf3d506875b26002a527647b50d9414de6 Mon Sep 17 00:00:00 2001 From: Tin Serdar Date: Tue, 13 Nov 2018 08:56:49 +0100 Subject: [PATCH 2/2] Fix solution for tests --- exercise/02/code.cpp | 8 ++++---- exercise/02/code.h | 2 +- exercise/02/test1.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/exercise/02/code.cpp b/exercise/02/code.cpp index e6670b6..b8de756 100644 --- a/exercise/02/code.cpp +++ b/exercise/02/code.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "code.h" -void f1(int* pa, int* pb) { - *pa += *pb; - *pb = *pa - *pb; - *pa -= *pb; +void f1(int &pa, int &pb) { + pa += pb; + pb = pa - pb; + pa -= pb; } void f2(int* startValuePointer, int* endValuePointer) { diff --git a/exercise/02/code.h b/exercise/02/code.h index 90cdbcd..0dcc61a 100644 --- a/exercise/02/code.h +++ b/exercise/02/code.h @@ -1,2 +1,2 @@ -void f1(int*, int*); +void f1(int&, int&); void f2(int*, int*); \ No newline at end of file diff --git a/exercise/02/test1.cpp b/exercise/02/test1.cpp index b438420..29b52ae 100644 --- a/exercise/02/test1.cpp +++ b/exercise/02/test1.cpp @@ -14,7 +14,7 @@ namespace simple_test TEST_METHOD(f1_changes_values) { int a=1, b=2; - f1(&a, &b); + f1(a, b); Assert::AreEqual(2, a); Assert::AreEqual(1, b); }