diff --git a/exercise/01/app/app/app.cpp b/exercise/01/app/app/app.cpp
new file mode 100644
index 0000000..0e32d06
Binary files /dev/null and b/exercise/01/app/app/app.cpp differ
diff --git a/exercise/01/app/app/app.vcxproj b/exercise/01/app/app/app.vcxproj
new file mode 100644
index 0000000..83f8d4b
--- /dev/null
+++ b/exercise/01/app/app/app.vcxproj
@@ -0,0 +1,171 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ 15.0
+ {2E05B316-3517-4AAB-A15D-5B53A24CF1EE}
+ 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
+
+
+ true
+
+
+ false
+
+
+ false
+
+
+
+ Use
+ Level3
+ Disabled
+ true
+ _DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+ pch.h
+ ..\..\lib\;%(AdditionalIncludeDirectories)
+
+
+ Console
+ true
+ static_library.lib;dynamic_library_with_implib.lib;%(AdditionalDependencies)
+ ..\..\dll2\$(Platform)\$(Configuration)\;..\..\lib\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)
+
+
+
+
+ Use
+ Level3
+ Disabled
+ true
+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+ pch.h
+
+
+ Console
+ true
+
+
+
+
+ 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/pch.cpp b/exercise/01/app/app/pch.cpp
new file mode 100644
index 0000000..135cedc
Binary files /dev/null and b/exercise/01/app/app/pch.cpp differ
diff --git a/exercise/01/app/app/pch.h b/exercise/01/app/app/pch.h
new file mode 100644
index 0000000..d87432d
Binary files /dev/null and b/exercise/01/app/app/pch.h differ
diff --git a/exercise/01/e01.sln b/exercise/01/e01.sln
index fb6ce37..41224a5 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\app.vcxproj", "{2E05B316-3517-4AAB-A15D-5B53A24CF1EE}"
+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
+ {2E05B316-3517-4AAB-A15D-5B53A24CF1EE}.Debug|x64.ActiveCfg = Debug|x64
+ {2E05B316-3517-4AAB-A15D-5B53A24CF1EE}.Debug|x64.Build.0 = Debug|x64
+ {2E05B316-3517-4AAB-A15D-5B53A24CF1EE}.Debug|x86.ActiveCfg = Debug|Win32
+ {2E05B316-3517-4AAB-A15D-5B53A24CF1EE}.Debug|x86.Build.0 = Debug|Win32
+ {2E05B316-3517-4AAB-A15D-5B53A24CF1EE}.Release|x64.ActiveCfg = Release|x64
+ {2E05B316-3517-4AAB-A15D-5B53A24CF1EE}.Release|x64.Build.0 = Release|x64
+ {2E05B316-3517-4AAB-A15D-5B53A24CF1EE}.Release|x86.ActiveCfg = Release|Win32
+ {2E05B316-3517-4AAB-A15D-5B53A24CF1EE}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/exercise/01/lib/static_library.vcxproj b/exercise/01/lib/static_library.vcxproj
index 9e42fda..d1287ea 100644
--- a/exercise/01/lib/static_library.vcxproj
+++ b/exercise/01/lib/static_library.vcxproj
@@ -110,6 +110,7 @@
true
_DEBUG;_LIB;%(PreprocessorDefinitions)
true
+ \..\lib\($Platform)\($Configuration)\
Windows
diff --git a/exercise/02/code.cpp b/exercise/02/code.cpp
index 85e778c..6128eaa 100644
--- a/exercise/02/code.cpp
+++ b/exercise/02/code.cpp
@@ -1,2 +1,15 @@
#include "stdafx.h"
#include "code.h"
+void f2(int* a1, int* a2)
+{
+ int diff = a2 - a1;
+ for (int i = 0; i < diff; i++)
+ *(a1 + i) = *(a1 + i) + 1;
+}
+
+void f1(int &a, int &b)
+{
+ int t = a;
+ a = b;
+ b = t;
+}
diff --git a/exercise/02/code.h b/exercise/02/code.h
index e69de29..e3ca751 100644
--- a/exercise/02/code.h
+++ b/exercise/02/code.h
@@ -0,0 +1,2 @@
+void f2(int* a1, int* a2);
+void f1(int &a, int &b);
\ No newline at end of file
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]);