Merge pull request #2636 from corob-msft/cr-1850

PRMerger6 · web-flow · commit 00480a9777fb · 2020-01-22T04:02:14.000-08:00
Address cpp-docs 'void main' issue 1850, part 1
diff --git a/docs/build/reference/zc-inline-remove-unreferenced-comdat.md b/docs/build/reference/zc-inline-remove-unreferenced-comdat.md
@@ -7,17 +7,17 @@ ms.assetid: a4c94224-1d73-4bea-a9d5-4fa73dc924df
 ---
 # /Zc:inline (Remove unreferenced COMDAT)
 
-Removes unreferenced functions or data that are COMDATs or only have internal linkage. When **/Zc:inline** is specified, the compiler requires that translation units that use inline data or inline functions must also include the definitions for the data or functions.
+Removes unreferenced data or functions that are COMDATs, or that only have internal linkage. Under **/Zc:inline**, the compiler specifies that translation units with inline data or functions must also include their definitions.
 
 ## Syntax
 
 > **/Zc:inline**[**-**]
 
 ## Remarks
 
-When **/Zc:inline** is specified, the compiler does not emit symbol information for unreferenced COMDAT functions or data, or for functions or data that have internal linkage only. This optimization simplifies some of the work performed by the linker in release builds or when the linker option [/OPT:REF](opt-optimizations.md) is specified. When the compiler performs this optimization, it can significantly reduce .obj file size and improve linker speeds. This compiler option is not enabled when optimizations are disabled ([/Od](od-disable-debug.md)) or when [/GL (Whole Program Optimization)](gl-whole-program-optimization.md) is specified.
+When **/Zc:inline** is specified, the compiler doesn't emit symbol information for unreferenced COMDAT functions or data. Or, for data or functions that have internal linkage only. This optimization simplifies some of the work the linker does in release builds, or when you specify the [/OPT:REF](opt-optimizations.md) linker option. This compiler optimization can significantly reduce .obj file size and improve linker speeds. The compiler option isn't enabled when you disable optimizations ([/Od](od-disable-debug.md)). Or, when you specify [/GL (Whole Program Optimization)](gl-whole-program-optimization.md).
 
-By default, this option is off (**/Zc:inline-**) in command-line builds. The [/permissive-](permissive-standards-conformance.md) option does not enable **/Zc:inline**. In MSBuild projects, the option is set by the **Configuration Properties** > **C/C++** > **Language** > **Remove unreferenced code and data** property, which is set to **Yes** by default.
+By default, this option is off (**/Zc:inline-**) in command-line builds. The [/permissive-](permissive-standards-conformance.md) option doesn't enable **/Zc:inline**. In MSBuild projects, the option is set by the **Configuration Properties** > **C/C++** > **Language** > **Remove unreferenced code and data** property, which is set to **Yes** by default.
 
 If **/Zc:inline** is specified, the compiler enforces the C++11 requirement that all functions declared `inline` must have a definition available in the same translation unit if they are used. When the option is not specified, the Microsoft compiler allows non-conformant code that invokes functions declared `inline` even if no definition is visible. For more information, see the C++11 standard, in section 3.2 and section 7.1.2. This compiler option was introduced in Visual Studio 2013 Update 2.
 
@@ -59,7 +59,7 @@ void Example::normal_call() {
 // Compile by using: cl /W4 /EHsc /O2 zcinline.cpp example.cpp
 #include "example.h"
 
-void main() {
+int main() {
    Example example;
    example.inline_call(); // normal call when definition unavailable
 }
@@ -101,7 +101,7 @@ void Example2::normal_call() {
 // Compile by using: cl /W4 /EHsc /O2 zcinline2.cpp example2.cpp
 #include "example2.h"
 
-void main() {
+int main() {
    Example2 example2;
    example2.inline_call(); // normal call when definition unavailable
 }
diff --git a/docs/build/reference/zc-referencebinding-enforce-reference-binding-rules.md b/docs/build/reference/zc-referencebinding-enforce-reference-binding-rules.md
@@ -7,15 +7,15 @@ ms.assetid: 0c6cfaac-9c2a-41a3-aa94-64ca8ef261fc
 ---
 # /Zc:referenceBinding (Enforce reference binding rules)
 
-When the **/Zc:referenceBinding** option is specified, the compiler does not allow a non-const lvalue reference to bind to a temporary.
+When the **/Zc:referenceBinding** option is specified, the compiler doesn't allow a non-const lvalue reference to bind to a temporary.
 
 ## Syntax
 
 > **/Zc:referenceBinding**[**-**]
 
 ## Remarks
 
-If **/Zc:referenceBinding** is specified, the compiler follows section 8.5.3 of the C++11 standard and does not allow expressions that bind a user-defined type temporary to a non-const lvalue reference. By default, or if **/Zc:referenceBinding-** is specified, the compiler allows such expressions as a Microsoft extension, but a level 4 warning is issued. For code security, portability and conformance, we recommend that you use **/Zc:referenceBinding**.
+If **/Zc:referenceBinding** is specified, the compiler follows section 8.5.3 of the C++11 standard: It doesn't allow expressions that bind a user-defined type temporary to a non-const lvalue reference. By default, or if **/Zc:referenceBinding-** is specified, the compiler allows such expressions as a Microsoft extension, but a level 4 warning is issued. For code security, portability and conformance, we recommend you use **/Zc:referenceBinding**.
 
 The **/Zc:referenceBinding** option is off by default. The [/permissive-](permissive-standards-conformance.md) compiler option implicitly sets this option, but it can be overridden by using **/Zc:referenceBinding-**.
 
@@ -35,7 +35,7 @@ S g() {
     return S{};
 }
 
-void main() {
+int main() {
     S& s = g();         // warning C4239 at /W4
     const S& cs = g();  // okay, bound to const ref
     f(g());             // Extension: error C2664 only if /Zc:referenceBinding
diff --git a/docs/build/walkthrough-compiling-a-native-cpp-program-on-the-command-line.md b/docs/build/walkthrough-compiling-a-native-cpp-program-on-the-command-line.md
@@ -68,7 +68,7 @@ Before you can build a C or C++ program on the command line, you must verify tha
    ```cpp
    #include <iostream>
    using namespace std;
-   void main()
+   int main()
    {
        cout << "Hello, world, from Visual C++!" << endl;
    }
diff --git a/docs/c-runtime-library/reference/wcsrtombs-s.md b/docs/c-runtime-library/reference/wcsrtombs-s.md
@@ -114,7 +114,7 @@ The **wcsrtombs_s** function is multithread safe as long as no function in the c
 
 #define MB_BUFFER_SIZE 100
 
-void main()
+int main()
 {
     const wchar_t   wcString[] =
                     {L"Every good boy does fine."};
diff --git a/docs/cpp/attributes.md b/docs/cpp/attributes.md
@@ -57,7 +57,7 @@ Attributes represent a standardized alternative to vendor-specific extensions su
 - `[[gsl::suppress(rules)]]` This Microsoft-specific attribute is used for suppressing warnings from checkers that enforce [Guidelines Support Library (GSL)](https://github.com/Microsoft/GSL) rules in code. For example, consider this code snippet:
 
     ```cpp
-    void main()
+    int main()
     {
         int arr[10]; // GSL warning 26494 will be fired
         int* p = arr; // GSL warning 26485 will be fired
@@ -77,4 +77,5 @@ Attributes represent a standardized alternative to vendor-specific extensions su
 
   - 26481 (Bounds Rule 1: Don't use pointer arithmetic. Use span instead.)
 
-  The first two warnings fire when you compile this code with the CppCoreCheck code analysis tool installed and activated. But the third warning doesn't fire because of the attribute. You can suppress the entire bounds profile by writing [[gsl::suppress(bounds)]] without including a specific rule number. The C++ Core Guidelines are designed to help you write better and safer code. The suppress attribute makes it easy to turn off the warnings when they are not wanted.
+  The first two warnings fire when you compile this code with the CppCoreCheck code analysis tool installed and activated. But the third warning doesn't fire because of the attribute. You can suppress the entire bounds profile by writing [[gsl::suppress(bounds)]] without including a specific rule number. The C++ Core Guidelines are designed to help you write better and safer code. The suppress attribute makes it easy to turn off the warnings when they are not wanted.
+  
diff --git a/docs/cpp/import-export-module.md b/docs/cpp/import-export-module.md
@@ -48,7 +48,7 @@ Non-exported names are not visible to code that imports the module:
 
 import module ModuleA;
 
-void main() {
+int main() {
   Bar::f(); // OK
   Bar::d(); // OK
   Bar::internal_f(); // Ill-formed: error C2065: 'internal_f': undeclared identifier
diff --git a/docs/error-messages/compiler-errors-1/compiler-error-c2346.md b/docs/error-messages/compiler-errors-1/compiler-error-c2346.md
@@ -37,7 +37,7 @@ struct S
    virtual __clrcall ~S() { }
 };
 
-void main()
+int main()
 {
    S s;
 }
diff --git a/docs/error-messages/compiler-warnings/compiler-warning-level-1-c4789.md b/docs/error-messages/compiler-warnings/compiler-warning-level-1-c4789.md
@@ -70,9 +70,9 @@ The following sample also generates C4789.
 // processor: x86
 short G;
 
-void main()
+int main()
 {
    int * p = (int *)&G;
    *p = 3;   // C4789 - writes an int through a pointer to short
 }
-```
+```
diff --git a/docs/error-messages/compiler-warnings/compiler-warning-level-3-c4373.md b/docs/error-messages/compiler-warnings/compiler-warning-level-3-c4373.md
@@ -37,7 +37,7 @@ struct Derived : Base
     }
 };
 
-void main()
+int main()
 {
     Derived d;
     Base* p = &d;
@@ -47,4 +47,4 @@ void main()
 
 ```Output
 derived
-```
+```

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ Before you can build a C or C++ program on the command line, you must verify tha`
`68`	`68`	```cpp
`69`	`69`	`#include <iostream>`
`70`	`70`	`using namespace std;`
`71`		`- void main()`
	`71`	`+ int main()`
`72`	`72`	`{`
`73`	`73`	`cout << "Hello, world, from Visual C++!" << endl;`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ The wcsrtombs_s function is multithread safe as long as no function in the c`
`114`	`114`
`115`	`115`	`#define MB_BUFFER_SIZE 100`
`116`	`116`
`117`		`-void main()`
	`117`	`+int main()`
`118`	`118`	`{`
`119`	`119`	`const wchar_t wcString[] =`
`120`	`120`	`{L"Every good boy does fine."};`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ struct S`
`37`	`37`	`virtual __clrcall ~S() { }`
`38`	`38`	`};`
`39`	`39`
`40`		`-void main()`
	`40`	`+int main()`
`41`	`41`	`{`
`42`	`42`	`S s;`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,9 @@ The following sample also generates C4789.`
`70`	`70`	`// processor: x86`
`71`	`71`	`short G;`
`72`	`72`
`73`		`-void main()`
	`73`	`+int main()`
`74`	`74`	`{`
`75`	`75`	`int * p = (int *)&G;`
`76`	`76`	`*p = 3; // C4789 - writes an int through a pointer to short`
`77`	`77`	`}`
`78`		-```
	`78`	+```
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ struct Derived : Base`
`37`	`37`	`}`
`38`	`38`	`};`
`39`	`39`
`40`		`-void main()`
	`40`	`+int main()`
`41`	`41`	`{`
`42`	`42`	`Derived d;`
`43`	`43`	`Base* p = &d;`
`@@ -47,4 +47,4 @@ void main()`
`47`	`47`
`48`	`48`	```Output
`49`	`49`	`derived`
`50`		-```
	`50`	+```