Merge pull request #2637 from corob-msft/cr-1850-2

PRMerger9 · web-flow · commit 3e4adfa53f0a · 2020-01-22T04:14:00.000-08:00
Address cpp-docs 'void main' issue 1850, part 2
diff --git a/docs/error-messages/compiler-warnings/compiler-warning-level-4-c4701.md b/docs/error-messages/compiler-warnings/compiler-warning-level-4-c4701.md
@@ -29,7 +29,7 @@ void func(int size)
         free(p);
 }
 
-void main()
+int main()
 {
     func(9);
 }
@@ -56,7 +56,7 @@ void func(int size)
         free(p);
 }
 
-void main()
+int main()
 {
     func(9);
 }
@@ -65,4 +65,4 @@ void main()
 ## See also
 
 [Compiler Warning (level 4) C4703](../../error-messages/compiler-warnings/compiler-warning-level-4-c4703.md)<br/>
-[Warnings, /sdl, and improving uninitialized variable detection](https://www.microsoft.com/security/blog/2012/06/06/warnings-sdl-and-improving-uninitialized-variable-detection/)
+[Warnings, /sdl, and improving uninitialized variable detection](https://www.microsoft.com/security/blog/2012/06/06/warnings-sdl-and-improving-uninitialized-variable-detection/)
diff --git a/docs/error-messages/compiler-warnings/compiler-warning-level-4-c4703.md b/docs/error-messages/compiler-warnings/compiler-warning-level-4-c4703.md
@@ -29,7 +29,7 @@ void func(int size)
         free(p);
 }
 
-void main()
+int main()
 {
     func(9);
 }
@@ -56,7 +56,7 @@ void func(int size)
         free(p);
 }
 
-void main()
+int main()
 {
     func(9);
 }
@@ -65,4 +65,4 @@ void main()
 ## See also
 
 [Compiler Warning (level 4) C4701](../../error-messages/compiler-warnings/compiler-warning-level-4-c4701.md)<br/>
-[Warnings, /sdl, and improving uninitialized variable detection](https://www.microsoft.com/security/blog/2012/06/06/warnings-sdl-and-improving-uninitialized-variable-detection/)
+[Warnings, /sdl, and improving uninitialized variable detection](https://www.microsoft.com/security/blog/2012/06/06/warnings-sdl-and-improving-uninitialized-variable-detection/)
diff --git a/docs/parallel/amp/using-tiles.md b/docs/parallel/amp/using-tiles.md
@@ -128,7 +128,7 @@ void TilingDescription() {
     }
 }
 
-void main() {
+int main() {
     TilingDescription();
     char wait;
     std::cin >> wait;
diff --git a/docs/parallel/amp/walkthrough-matrix-multiplication.md b/docs/parallel/amp/walkthrough-matrix-multiplication.md
@@ -95,7 +95,7 @@ A is a 3-by-2 matrix and B is a 2-by-3 matrix. The product of multiplying A by B
        }
    }
 
-   void main() {
+   int main() {
        MultiplyWithOutAMP();
        getchar();
    }
@@ -158,7 +158,7 @@ A is a 3-by-2 matrix and B is a 2-by-3 matrix. The product of multiplying A by B
 1. Modify the `main` method to call the `MultiplyWithAMP` method.
 
    ```cpp
-   void main() {
+   int main() {
        MultiplyWithOutAMP();
        MultiplyWithAMP();
        getchar();
@@ -302,7 +302,7 @@ To implement this algorithm, the code:
 1. Modify the main method to call the `MultiplyWithTiling` method, as shown.
 
    ```cpp
-   void main() {
+   int main() {
        MultiplyWithOutAMP();
        MultiplyWithAMP();
        MultiplyWithTiling();
diff --git a/docs/standard-library/file-system-navigation.md b/docs/standard-library/file-system-navigation.md
@@ -82,7 +82,7 @@ wstring DisplayPathInfo()
     return wos.str();
 }
 
-void main(int argc, char* argv[])
+int main(int argc, char* argv[])
 {
     wcout << DisplayPathInfo() << endl;
     // wcout << ComparePaths() << endl; // see following example
@@ -161,7 +161,7 @@ A `path` object is implicitly convertible to `std::wstring` or `std::string`. Th
 using namespace std;
 using namespace std::experimental::filesystem;
 
-void main(int argc, char* argv[])
+int main(int argc, char* argv[])
 {
     wchar_t* p = L"C:/Users/Public/Documents";
     path filePath(p);
diff --git a/docs/standard-library/iomanip-functions.md b/docs/standard-library/iomanip-functions.md
@@ -167,7 +167,7 @@ void show_quoted_v_nonquoted()
     cout << "Quoted          : " << extracted_quoted << endl;
 }
 
-void main(int argc, char* argv[])
+int main(int argc, char* argv[])
 {
     show_quoted_v_nonquoted();
 
@@ -243,7 +243,7 @@ void show_custom_escape()
     // after round-tripping.
 }
 
-void main(int argc, char* argv[])
+int main(int argc, char* argv[])
 {
     cout << "Custom delimiter:" << endl;
     show_custom_delimiter();

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ void func(int size)`
`29`	`29`	`free(p);`
`30`	`30`	`}`
`31`	`31`
`32`		`-void main()`
	`32`	`+int main()`
`33`	`33`	`{`
`34`	`34`	`func(9);`
`35`	`35`	`}`
`@@ -56,7 +56,7 @@ void func(int size)`
`56`	`56`	`free(p);`
`57`	`57`	`}`
`58`	`58`
`59`		`-void main()`
	`59`	`+int main()`
`60`	`60`	`{`
`61`	`61`	`func(9);`
`62`	`62`	`}`
`@@ -65,4 +65,4 @@ void main()`
`65`	`65`	`## See also`
`66`	`66`
`67`	`67`	`[Compiler Warning (level 4) C4703](../../error-messages/compiler-warnings/compiler-warning-level-4-c4703.md)<br/>`
`68`		`-[Warnings, /sdl, and improving uninitialized variable detection](https://www.microsoft.com/security/blog/2012/06/06/warnings-sdl-and-improving-uninitialized-variable-detection/)`
	`68`	`+[Warnings, /sdl, and improving uninitialized variable detection](https://www.microsoft.com/security/blog/2012/06/06/warnings-sdl-and-improving-uninitialized-variable-detection/)`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ void TilingDescription() {`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`
`131`		`-void main() {`
	`131`	`+int main() {`
`132`	`132`	`TilingDescription();`
`133`	`133`	`char wait;`
`134`	`134`	`std::cin >> wait;`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ wstring DisplayPathInfo()`
`82`	`82`	`return wos.str();`
`83`	`83`	`}`
`84`	`84`
`85`		`-void main(int argc, char* argv[])`
	`85`	`+int main(int argc, char* argv[])`
`86`	`86`	`{`
`87`	`87`	`wcout << DisplayPathInfo() << endl;`
`88`	`88`	`// wcout << ComparePaths() << endl; // see following example`
@@ -161,7 +161,7 @@ A `path` object is implicitly convertible to `std::wstring` or `std::string`. Th
`161`	`161`	`using namespace std;`
`162`	`162`	`using namespace std::experimental::filesystem;`
`163`	`163`
`164`		`-void main(int argc, char* argv[])`
	`164`	`+int main(int argc, char* argv[])`
`165`	`165`	`{`
`166`	`166`	`wchar_t* p = L"C:/Users/Public/Documents";`
`167`	`167`	`path filePath(p);`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ void show_quoted_v_nonquoted()`
`167`	`167`	`cout << "Quoted : " << extracted_quoted << endl;`
`168`	`168`	`}`
`169`	`169`
`170`		`-void main(int argc, char* argv[])`
	`170`	`+int main(int argc, char* argv[])`
`171`	`171`	`{`
`172`	`172`	`show_quoted_v_nonquoted();`
`173`	`173`
`@@ -243,7 +243,7 @@ void show_custom_escape()`
`243`	`243`	`// after round-tripping.`
`244`	`244`	`}`
`245`	`245`
`246`		`-void main(int argc, char* argv[])`
	`246`	`+int main(int argc, char* argv[])`
`247`	`247`	`{`
`248`	`248`	`cout << "Custom delimiter:" << endl;`
`249`	`249`	`show_custom_delimiter();`