Tidy up for VS2022

cpp-tutor · cpp-tutor · commit 2624ff5fce91 · 2022-10-14T16:59:36.000+01:00
diff --git a/README.md b/README.md
@@ -4,18 +4,18 @@ Complete, working programs from the C++ tutorial hosted at:
 
 https://learnmoderncpp.com/course-details/
 
-## Usage
+## Contents
 
-The "headers" subdirectory contains C++ programs with legacy header `#includes`, whilst the "modules" subdirectory contains the same programs but using the `import` keyword instead. See https://learnmoderncpp.com/2020/09/05/where-are-c-modules/ for more details about C++ compilers which have support for modules.
+The "headers" subdirectory contains C++ programs with legacy header `#includes`, whilst the "modules" subdirectory contains the same programs using the `import` keyword instead. See https://learnmoderncpp.com/2020/09/05/where-are-c-modules/ for more details about C++ compilers which have support for modules.
 
 ## Compiling under Windows
 
-All programs compile successfully under Windows with Visual Studio 2019 (v16.8 or later).
+All programs compile successfully under Windows with Visual Studio 2022 (v17.x or later).
 
-The supplied batch scripts `build-vs2019-headers.bat` and
-`build-vs2019-modules.bat` can be used to compile all of the programs within a Visual Studio command prompt, simply run:
+The supplied batch scripts `build-vs2022-headers.bat` and
+`build-vs2022-modules.bat` can be used to compile all of the programs within a Visual Studio command prompt, simply run:
 
-```C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat```
+```C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat```
 
 or similar in a command window, or create a desktop link, and then run either of the build scripts.
 
diff --git a/headers/03-calc.cpp b/headers/03-calc.cpp
@@ -1,4 +1,4 @@
-// 03-calc.cpp : simple calculator with four funnctions
+// 03-calc.cpp : simple calculator with four functions
 
 #include <iostream>
 using namespace std;
diff --git a/headers/07-find.cpp b/headers/07-find.cpp
@@ -5,6 +5,7 @@
 #include <string>
 #include <vector>
 #include <set>
+#include <iterator>
 using namespace std;
 
 int main() {
diff --git a/headers/07-set.cpp b/headers/07-set.cpp
@@ -4,6 +4,7 @@
 #include <string>
 #include <set>
 #include <algorithm>
+#include <iterator>
 using namespace std;
 
 int main() {
diff --git a/headers/07-vector.cpp b/headers/07-vector.cpp
@@ -3,6 +3,7 @@
 #include <iostream>
 #include <vector>
 #include <algorithm>
+#include <iterator>
 using namespace std;
 
 int main() {
diff --git a/headers/build-clang-headers.sh b/headers/build-clang-headers.sh
diff --git a/headers/build-gcc-headers.sh b/headers/build-gcc-headers.sh
diff --git a/headers/build-vs2022-headers.bat b/headers/build-vs2022-headers.bat
@@ -1,6 +1,6 @@
 @echo off
 REM This script will compile all files with .cpp extension in current directory
-REM Visual Studio 2019 (16.8) header file version
+REM Visual Studio 2022 (17.x) header file version
 
 set failures=0
 for %%f in (*.cpp) do echo %%f... && cl /std:c++latest /EHsc %%f >nul 2>nul || echo Failed to compile %%f && set /A failures=failures+1
diff --git a/modules/03-calc.cpp b/modules/03-calc.cpp
@@ -1,4 +1,4 @@
-// 03-calc.cpp : simple calculator with four funnctions
+// 03-calc.cpp : simple calculator with four functions
 
 import std.core;
 using namespace std;
diff --git a/modules/build-clang-modules.sh b/modules/build-clang-modules.sh
diff --git a/modules/build-vs2022-modules.bat b/modules/build-vs2022-modules.bat
@@ -1,7 +1,7 @@
 @echo off
 REM This script will compile all files with .cpp extension in current directory
-REM Visual Studio 2019 (16.8) C++ modules version
+REM Visual Studio 2022 (17.x) C++ modules version
 
 set failures=0
-for %%f in (*.cpp) do echo %%f... && cl /std:c++latest /EHsc /experimental:module /MD /DEOF=-1 %%f >nul 2>nul || echo Failed to compile %%f && set /A failures=failures+1
+for %%f in (*.cpp) do echo %%f... && cl /std:c++latest /EHsc /experimental:module /MD %%f >nul 2>nul || echo Failed to compile %%f && set /A failures=failures+1
 echo A total of %failures% files failed to compile.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// 03-calc.cpp : simple calculator with four funnctions`
	`1`	`+// 03-calc.cpp : simple calculator with four functions`
`2`	`2`
`3`	`3`	`#include <iostream>`
`4`	`4`	`using namespace std;`