diff --git a/.gitignore b/.gitignore index 4164f21..e3a747b 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ *.ipdb *.iobj *.exp +.vs/ \ No newline at end of file diff --git a/example/01/p01.vcxproj b/example/01/p01.vcxproj index 71eeb22..37cfd07 100644 --- a/example/01/p01.vcxproj +++ b/example/01/p01.vcxproj @@ -172,6 +172,7 @@ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h + stdcpp17 Console @@ -202,6 +203,7 @@ _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h + stdcpp17 Console diff --git a/exercise/01/app/app.cpp b/exercise/01/app/app.cpp new file mode 100644 index 0000000..71ac416 Binary files /dev/null and b/exercise/01/app/app.cpp differ diff --git a/exercise/01/app/app.vcxproj b/exercise/01/app/app.vcxproj new file mode 100644 index 0000000..992a105 --- /dev/null +++ b/exercise/01/app/app.vcxproj @@ -0,0 +1,174 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {2338FE66-E92D-4026-AB7F-90C8A01F0BD6} + 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)\Bin\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\Bin\$(Platform)\$(Configuration)\ + + + false + + + false + + + + Use + Level3 + Disabled + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + + + Console + true + $(SolutionDir)\Bin\$(Platform)\$(Configuration)\ + static_library.lib;dynamic_library_with_implib.lib;%(AdditionalDependencies) + + + + + Use + Level3 + Disabled + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + + + Console + true + $(SolutionDir)\Bin\$(Platform)\$(Configuration)\ + static_library.lib;dynamic_library_with_implib.lib;%(AdditionalDependencies) + + + + + Use + Level3 + MaxSpeed + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + + + Console + true + true + true + + + + + Use + Level3 + MaxSpeed + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + + + Console + true + true + true + + + + + + + + + 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 0000000..a38f8a3 Binary files /dev/null and b/exercise/01/app/pch.cpp differ diff --git a/exercise/01/app/pch.h b/exercise/01/app/pch.h new file mode 100644 index 0000000..d87432d Binary files /dev/null and b/exercise/01/app/pch.h differ diff --git a/exercise/01/dll1/dllmain.cpp b/exercise/01/dll1/dllmain.cpp index 1637303..40918d5 100644 Binary files a/exercise/01/dll1/dllmain.cpp and b/exercise/01/dll1/dllmain.cpp differ diff --git a/exercise/01/dll1/dynamic_library.cpp b/exercise/01/dll1/dynamic_library.cpp index 7a29418..6386819 100644 Binary files a/exercise/01/dll1/dynamic_library.cpp and b/exercise/01/dll1/dynamic_library.cpp differ diff --git a/exercise/01/dll1/dynamic_library.vcxproj b/exercise/01/dll1/dynamic_library.vcxproj index 7530308..0387866 100644 --- a/exercise/01/dll1/dynamic_library.vcxproj +++ b/exercise/01/dll1/dynamic_library.vcxproj @@ -72,12 +72,12 @@ true - $(Platform)\$(Configuration)\ + $(SolutionDir)\Bin\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - $(Platform)\$(Configuration)\ + $(SolutionDir)\Bin\$(Platform)\$(Configuration)\ false diff --git a/exercise/01/dll2/dynamic_library_with_implib.vcxproj b/exercise/01/dll2/dynamic_library_with_implib.vcxproj index 9ad2802..591ffd4 100644 --- a/exercise/01/dll2/dynamic_library_with_implib.vcxproj +++ b/exercise/01/dll2/dynamic_library_with_implib.vcxproj @@ -72,12 +72,12 @@ true - $(Platform)\$(Configuration)\ + $(SolutionDir)\Bin\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - $(Platform)\$(Configuration)\ + $(SolutionDir)\Bin\$(Platform)\$(Configuration)\ false diff --git a/exercise/01/e01.sln b/exercise/01/e01.sln index fb6ce37..67c040b 100644 --- a/exercise/01/e01.sln +++ b/exercise/01/e01.sln @@ -5,17 +5,12 @@ 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}" - 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 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app", "app\app.vcxproj", "{2338FE66-E92D-4026-AB7F-90C8A01F0BD6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -32,14 +27,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 +43,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 + {2338FE66-E92D-4026-AB7F-90C8A01F0BD6}.Debug|x64.ActiveCfg = Debug|x64 + {2338FE66-E92D-4026-AB7F-90C8A01F0BD6}.Debug|x64.Build.0 = Debug|x64 + {2338FE66-E92D-4026-AB7F-90C8A01F0BD6}.Debug|x86.ActiveCfg = Debug|Win32 + {2338FE66-E92D-4026-AB7F-90C8A01F0BD6}.Debug|x86.Build.0 = Debug|Win32 + {2338FE66-E92D-4026-AB7F-90C8A01F0BD6}.Release|x64.ActiveCfg = Release|x64 + {2338FE66-E92D-4026-AB7F-90C8A01F0BD6}.Release|x64.Build.0 = Release|x64 + {2338FE66-E92D-4026-AB7F-90C8A01F0BD6}.Release|x86.ActiveCfg = Release|Win32 + {2338FE66-E92D-4026-AB7F-90C8A01F0BD6}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/exercise/01/lib/fun.cpp b/exercise/01/lib/fun.cpp index 0517472..ee9087e 100644 Binary files a/exercise/01/lib/fun.cpp and b/exercise/01/lib/fun.cpp differ diff --git a/exercise/01/lib/public.h b/exercise/01/lib/public.h index fc6a77d..0c47d66 100644 Binary files a/exercise/01/lib/public.h and b/exercise/01/lib/public.h differ diff --git a/exercise/01/lib/static_library.vcxproj b/exercise/01/lib/static_library.vcxproj index 9e42fda..9f8d59b 100644 --- a/exercise/01/lib/static_library.vcxproj +++ b/exercise/01/lib/static_library.vcxproj @@ -72,12 +72,12 @@ true - $(Platform)\$(Configuration)\ + $(SolutionDir)\Bin\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - $(Platform)\$(Configuration)\ + $(SolutionDir)\Bin\$(Platform)\$(Configuration)\ false diff --git a/exercise/02/code.cpp b/exercise/02/code.cpp index 85e778c..229d0e0 100644 --- a/exercise/02/code.cpp +++ b/exercise/02/code.cpp @@ -1,2 +1,14 @@ #include "stdafx.h" #include "code.h" + +void f1(int& a, int& b) +{ + auto c = a; + a = b; + b = c; +} + +void f2(int* a, const int* b) +{ + for (; a != b; ++a) *a = *a + 1; +} diff --git a/exercise/02/code.h b/exercise/02/code.h index e69de29..cc7f880 100644 --- a/exercise/02/code.h +++ b/exercise/02/code.h @@ -0,0 +1,3 @@ +void f1(int& a, int& b); + +void f2(int* a, const int* b); diff --git a/exercise/02/test1.cpp b/exercise/02/test1.cpp index 33dfab7..29b52ae 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]);