Merge pull request MicrosoftDocs#5072 from MicrosoftDocs/FromPublicMasterBranch

PhilKang0704 · web-flow · commit 7c6f1073230a · 2023-10-21T01:25:41.000+08:00
Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main)
diff --git a/docs/c-runtime-library/reference/chdir-wchdir.md b/docs/c-runtime-library/reference/chdir-wchdir.md
@@ -78,7 +78,6 @@ For more compatibility information, see [Compatibility](../compatibility.md).
 
 int main( int argc, char *argv[] )
 {
-
    if(_chdir( argv[1] ) )
    {
       switch (errno)
diff --git a/docs/c-runtime-library/reference/chmod-wchmod.md b/docs/c-runtime-library/reference/chmod-wchmod.md
@@ -114,7 +114,6 @@ void set_mode_and_report(char * filename, int mask)
 
 int main( void )
 {
-
    // Create or append to a file.
    system( "echo /* End of file */ >> crt_chmod.c_input" );
 
diff --git a/docs/c-runtime-library/reference/cputs-cputws.md b/docs/c-runtime-library/reference/cputs-cputws.md
@@ -106,7 +106,6 @@ void wprint_to_console(wchar_t* wbuffer)
 
 int main()
 {
-
    // String to print at console.
    // Notice the \r (return) character.
    char* buffer = "Hello world (courtesy of _cputs)!\r\n";
diff --git a/docs/c-runtime-library/reference/pipe.md b/docs/c-runtime-library/reference/pipe.md
@@ -105,7 +105,6 @@ enum PIPES { READ, WRITE }; /* Constants 0 and 1 for READ and WRITE */
 
 int main( int argc, char *argv[] )
 {
-
    int fdpipe[2];
    char hstr[20];
    int pid, problem, c;
diff --git a/docs/code-quality/c6014.md b/docs/code-quality/c6014.md
@@ -97,7 +97,6 @@ const int TEST_DATA [ARRAYSIZE] = {10,20,30,40,50,60,70,80,90,100};
 
 void f( )
 {
-
     unique_ptr<int[]> p(new int[ARRAYSIZE]);
     std::copy(begin(TEST_DATA), end(TEST_DATA), p.get());
 
diff --git a/docs/cpp/class-templates.md b/docs/cpp/class-templates.md
@@ -83,7 +83,6 @@ using namespace std;
 
 class X
 {
-
    template <class T>
    struct Y
    {
diff --git a/docs/cpp/codesnippet/CPP/how-to-create-and-use-ccomptr-and-ccomqiptr-instances_1.cpp b/docs/cpp/codesnippet/CPP/how-to-create-and-use-ccomptr-and-ccomqiptr-instances_1.cpp
@@ -1,6 +1,5 @@
 void CComPtrDemo()
 {
-
     HRESULT hr = CoInitialize(NULL);
 
     // Declare the smart pointer.
diff --git a/docs/cpp/codesnippet/CPP/how-to-create-and-use-ccomptr-and-ccomqiptr-instances_3.cpp b/docs/cpp/codesnippet/CPP/how-to-create-and-use-ccomptr-and-ccomqiptr-instances_3.cpp
@@ -1,6 +1,5 @@
 void COMAutomationSmartPointerDemo()
 {
-
     CComPtr<IDispatch> pWord;
     CComQIPtr<IDispatch, &IID_IDispatch> pqi = pWord;
     CComDispatchDriver pDriver = pqi;
diff --git a/docs/cpp/examples-of-lambda-expressions.md b/docs/cpp/examples-of-lambda-expressions.md
@@ -23,7 +23,6 @@ Because a lambda expression is typed, you can assign it to an **`auto`** variabl
 
 int main()
 {
-
     using namespace std;
 
     // Assign the lambda expression that adds two numbers to an auto variable.
diff --git a/docs/cpp/function-overloading.md b/docs/cpp/function-overloading.md
@@ -401,7 +401,6 @@ using namespace std;
 
 class C
 {
-
 public:
     C() {/*expensive initialization*/}
     vector<unsigned> get_data() &
diff --git a/docs/cpp/if-else-statement-cpp.md b/docs/cpp/if-else-statement-cpp.md
@@ -131,7 +131,6 @@ int getValue() { return 42; }
 
 int main()
 {
-
     if (auto it = m.find(10); it != m.end())
     {
         cout << it->second << "\n";
diff --git a/docs/cpp/raw-pointers.md b/docs/cpp/raw-pointers.md
@@ -150,7 +150,6 @@ void func(int arr[], int length)
 
 int main()
 {
-
     int i[5]{ 1,2,3,4,5 };
     // sizeof(i) = total bytes
     int j = sizeof(i) / sizeof(i[0]);
@@ -170,7 +169,6 @@ using namespace std;
 
 int main()
 {
-
     BITMAPINFOHEADER header;
     header.biHeight = 100; // Multiple of 4 for simplicity.
     header.biWidth = 100;
diff --git a/docs/error-messages/compiler-errors-1/compiler-error-c2058.md b/docs/error-messages/compiler-errors-1/compiler-error-c2058.md
@@ -11,3 +11,16 @@ ms.assetid: 81e08e6b-15f7-41b4-980a-53763e19990c
 constant expression is not integral
 
 The context requires an integer constant expression.
+
+The following sample generates C2058:
+
+```cpp
+// C2058.cpp
+struct alignas(1.5) S {};   // C2058
+
+int main() {
+   int arr[1.5];   // C2058
+}
+```
+
+To resolve the issue, use an integer constant expression. For example, `int arr[2];`
diff --git a/docs/error-messages/compiler-errors-1/compiler-error-c2082.md b/docs/error-messages/compiler-errors-1/compiler-error-c2082.md
@@ -16,8 +16,11 @@ The following sample generates C2082:
 
 ```cpp
 // C2082.cpp
-void func(int i) {
-   int i;   // C2082
-   int ii;   // OK
+void func(int num1) {
+   int num1;   // C2082
+   int num2;   // OK
+
+   auto lambda1 = [](int num1){ int num1; };   // C2082
+   auto lambda2 = [](int num1){ int num2; };   // OK
 }
 ```
diff --git a/docs/error-messages/compiler-errors-2/compiler-error-c2504.md b/docs/error-messages/compiler-errors-2/compiler-error-c2504.md
@@ -10,7 +10,7 @@ ms.assetid: c9e002a6-a4ee-4ba7-970e-edf4adb83692
 
 'class' : base class undefined
 
-The base class is declared but never defined.  Possible causes:
+The base class is declared but never defined. Possible causes:
 
 1. Missing include file.
 
@@ -23,11 +23,7 @@ The following sample generates C2504:
 // compile with: /c
 class A;
 class B : public A {};   // C2504
-```
-
-// OK
 
-```
-class C{};
-class D : public C {};
+class C {};
+class D : public C {};   // OK
 ```
diff --git a/docs/error-messages/compiler-errors-2/compiler-error-c2992.md b/docs/error-messages/compiler-errors-2/compiler-error-c2992.md
@@ -20,30 +20,34 @@ The following sample generates C2992:
 // C2992.cpp
 // compile with: /c
 template <class T>
-struct TC1 {
+struct Outer {
    template <class U>
-   struct TC2;
+   struct Inner;
 };
 
-template <class T>   struct TC1<T>::TC2 {};   // C2992
+template <class T>   // C2992
+struct Outer<T>::Inner {};
 
-// OK
 template <class T>
-template <class U>
-struct TC1<T>::TC2 {};
-// C2992 can also occur when using generics:
-// C2992c.cpp
-// compile with: /clr /c
+template <class U>   // OK
+struct Outer<T>::Inner {};
+```
+
+C2992 can also occur when using generics:
+
+```cpp
+// C2992b.cpp
+// compile with: /c /clr
 generic <class T>
-ref struct GC1 {
+ref struct Outer {
    generic <class U>
-   ref struct GC2;
+   ref struct Inner;
 };
 
-generic <class T> ref struct GC1<T>::GC2 {};   // C2992
+generic <class T>   // C2992
+ref struct Outer<T>::Inner {};
 
-// OK
 generic <class T>
-generic <class U>
-ref struct GC1<T>::GC2 {};
+generic <class U>   // OK
+ref struct Outer<T>::Inner {};
 ```
diff --git a/docs/standard-library/algorithm-functions.md b/docs/standard-library/algorithm-functions.md
@@ -5091,7 +5091,6 @@ void PrintResult(const string& msg, const pair<vector<int>::iterator, vector<int
 
 int main()
 {
-
     vector<int> vec_1{ 0, 5, 10, 15, 20, 25 };
     vector<int> vec_2{ 0, 5, 10, 15, 20, 25, 30 };
 
diff --git a/docs/standard-library/bitset-operators.md b/docs/standard-library/bitset-operators.md
@@ -162,7 +162,6 @@ The template function extracts elements from *i_str* and inserts them into the b
 using namespace std;
 int main()
 {
-
    bitset<5> b1;
    cout << "Enter string of (0 or 1) bits for input into bitset<5>.\n"
         << "Try bit string of length less than or equal to 5,\n"
diff --git a/docs/standard-library/function-class.md b/docs/standard-library/function-class.md
@@ -225,7 +225,6 @@ private:
 
 int main()
 {
-
     typedef std::vector< std::function<int (int)> > vf_t;
 
     vf_t v;
diff --git a/docs/standard-library/greater-equal-struct.md b/docs/standard-library/greater-equal-struct.md
@@ -24,7 +24,7 @@ template <>
 struct greater_equal<void>
 {
   template <class T, class U>
-  auto operator()(T&& Left, U&& Right) const`
+  auto operator()(T&& Left, U&& Right) const
     -> decltype(std::forward<T>(Left)>= std::forward<U>(Right));
 };
 ```
diff --git a/docs/standard-library/hash-compare-class.md b/docs/standard-library/hash-compare-class.md
@@ -12,8 +12,9 @@ The class template describes an object that can be used by any of the hash assoc
 
 ## Syntax
 
+```cpp
 class hash_compare
-   {
+{
    Traits comp;
    public:
    const size_t bucket_size = 4;
@@ -24,7 +25,8 @@ class hash_compare
    bool operator()(
    const Key& key1,
    const Key& key2) const;
-   };
+};
+```
 
 ## Remarks
 
diff --git a/docs/standard-library/input-iterator-tag-struct.md b/docs/standard-library/input-iterator-tag-struct.md
@@ -12,7 +12,9 @@ A class that provides a return type for `iterator_category` function that repres
 
 ## Syntax
 
+```cpp
 struct input_iterator_tag {};
+```
 
 ## Remarks
 
diff --git a/docs/standard-library/is-placeholder-class.md b/docs/standard-library/is-placeholder-class.md
@@ -12,9 +12,11 @@ Tests if type is a placeholder.
 
 ## Syntax
 
+```cpp
 struct is_placeholder {
    static const int value;
 };
+```
 
 ## Remarks
 
diff --git a/docs/standard-library/logical-and-struct.md b/docs/standard-library/logical-and-struct.md
@@ -24,7 +24,7 @@ template <>
 struct logical_and<void>
 {
   template <class T, class U>
-  auto operator()(T&& Left, U&& Right) const`
+  auto operator()(T&& Left, U&& Right) const
     -> decltype(std::forward<T>(Left) && std::forward<U>(Right));
 };
 ```
diff --git a/docs/standard-library/logical-not-struct.md b/docs/standard-library/logical-not-struct.md
@@ -12,7 +12,7 @@ A predefined function object that performs the logical not operation (`operator!
 
 ## Syntax
 
-```
+```cpp
 template <class Type = void>
 struct logical_not : public unary_function<Type, bool>
 {
@@ -24,7 +24,7 @@ template <>
 struct logical_not<void>
 {
   template <class Type>
-  auto operator()(Type&& Left) const`
+  auto operator()(Type&& Left) const
      -> decltype(!std::forward<Type>(Left));
 };
 ```
diff --git a/docs/standard-library/logical-or-struct.md b/docs/standard-library/logical-or-struct.md
@@ -12,7 +12,7 @@ A predefined function object that performs the logical disjunction operation ( `
 
 ## Syntax
 
-```
+```cpp
 template <class Type = void>
 struct logical_or : public binary_function<Type, Type, bool>
 {
@@ -24,7 +24,7 @@ template <>
 struct logical_or<void>
 {
   template <class T, class U>
-  auto operator()(T&& Left, U&& Right) const`
+  auto operator()(T&& Left, U&& Right) const
     -> decltype(std::forward<T>(Left) || std::forward<U>(Right));
 };
 ```
diff --git a/docs/standard-library/map-class.md b/docs/standard-library/map-class.md
@@ -1434,7 +1434,6 @@ template <typename M> void print(const M& m) {
 
 int main()
 {
-
     // insert single values
     map<int, int> m1;
     // call insert(const value_type&) version
diff --git a/docs/standard-library/minus-struct.md b/docs/standard-library/minus-struct.md
@@ -12,7 +12,7 @@ A predefined function object that performs the subtraction operation (binary `op
 
 ## Syntax
 
-```
+```cpp
 template <class Type = void>
 struct minus : public binary_function <Type, Type, Type>
 {
@@ -24,7 +24,7 @@ template <>
 struct minus<void>
 {
   template <class T, class U>
-  auto operator()(T&& Left, U&& Right) const`
+  auto operator()(T&& Left, U&& Right) const
     -> decltype(std::forward<T>(Left) - std::forward<U>(Right));
 };
 ```
diff --git a/docs/standard-library/modulus-struct.md b/docs/standard-library/modulus-struct.md
@@ -12,7 +12,7 @@ A predefined function object that performs the modulus division operation (`oper
 
 ## Syntax
 
-```
+```cpp
 template <class Type = void>
 struct modulus : public binary_function <Type, Type, Type>
 {
@@ -24,7 +24,7 @@ template <>
 struct modulus<void>
 {
   template <class T, class U>
-  auto operator()(T&& Left, U&& Right) const`
+  auto operator()(T&& Left, U&& Right) const
     -> decltype(std::forward<T>(Left) % std::forward<U>(Right));
 };
 ```
diff --git a/docs/standard-library/multimap-class.md b/docs/standard-library/multimap-class.md
@@ -1246,7 +1246,6 @@ template <typename M> void print(const M& m) {
 
 int main()
 {
-
     // insert single values
     multimap<int, int> m1;
     // call insert(const value_type&) version
diff --git a/docs/standard-library/multiplies-struct.md b/docs/standard-library/multiplies-struct.md
@@ -12,7 +12,7 @@ A predefined function object that performs the multiplication operation (binary
 
 ## Syntax
 
-```
+```cpp
 template <class Type = void>
 struct multiplies : public binary_function <Type, Type, Type>
 {
@@ -24,7 +24,7 @@ template <>
 struct multiplies<void>
 {
   template <class T, class U>
-  auto operator()(T&& Left, U&& Right) const`
+  auto operator()(T&& Left, U&& Right) const
     -> decltype(std::forward<T>(Left) * std::forward<U>(Right));
 };
 ```
diff --git a/docs/standard-library/multiset-class.md b/docs/standard-library/multiset-class.md
diff --git a/docs/standard-library/negate-struct.md b/docs/standard-library/negate-struct.md
diff --git a/docs/standard-library/negative-binomial-distribution-class.md b/docs/standard-library/negative-binomial-distribution-class.md
diff --git a/docs/standard-library/not-equal-to-struct.md b/docs/standard-library/not-equal-to-struct.md
diff --git a/docs/standard-library/once-flag-structure.md b/docs/standard-library/once-flag-structure.md
diff --git a/docs/standard-library/output-iterator-tag-struct.md b/docs/standard-library/output-iterator-tag-struct.md
diff --git a/docs/standard-library/plus-struct.md b/docs/standard-library/plus-struct.md
diff --git a/docs/standard-library/set-class.md b/docs/standard-library/set-class.md
diff --git a/docs/standard-library/utility-functions.md b/docs/standard-library/utility-functions.md

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ For more compatibility information, see [Compatibility](../compatibility.md).`
`78`	`78`
`79`	`79`	`int main( int argc, char *argv[] )`
`80`	`80`	`{`
`81`		`-`
`82`	`81`	`if(_chdir( argv[1] ) )`
`83`	`82`	`{`
`84`	`83`	`switch (errno)`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,6 @@ void set_mode_and_report(char * filename, int mask)`
`114`	`114`
`115`	`115`	`int main( void )`
`116`	`116`	`{`
`117`		`-`
`118`	`117`	`// Create or append to a file.`
`119`	`118`	`system( "echo /* End of file */ >> crt_chmod.c_input" );`
`120`	`119`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,6 @@ void wprint_to_console(wchar_t* wbuffer)`
`106`	`106`
`107`	`107`	`int main()`
`108`	`108`	`{`
`109`		`-`
`110`	`109`	`// String to print at console.`
`111`	`110`	`// Notice the \r (return) character.`
`112`	`111`	`char* buffer = "Hello world (courtesy of _cputs)!\r\n";`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,6 @@ enum PIPES { READ, WRITE }; /* Constants 0 and 1 for READ and WRITE */`
`105`	`105`
`106`	`106`	`int main( int argc, char *argv[] )`
`107`	`107`	`{`
`108`		`-`
`109`	`108`	`int fdpipe[2];`
`110`	`109`	`char hstr[20];`
`111`	`110`	`int pid, problem, c;`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,6 @@ const int TEST_DATA [ARRAYSIZE] = {10,20,30,40,50,60,70,80,90,100};`
`97`	`97`
`98`	`98`	`void f( )`
`99`	`99`	`{`
`100`		`-`
`101`	`100`	`unique_ptr<int[]> p(new int[ARRAYSIZE]);`
`102`	`101`	`std::copy(begin(TEST_DATA), end(TEST_DATA), p.get());`
`103`	`102`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,6 @@ using namespace std;`
`83`	`83`
`84`	`84`	`class X`
`85`	`85`	`{`
`86`		`-`
`87`	`86`	`template <class T>`
`88`	`87`	`struct Y`
`89`	`88`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`void CComPtrDemo()`
`2`	`2`	`{`
`3`		`-`
`4`	`3`	`HRESULT hr = CoInitialize(NULL);`
`5`	`4`
`6`	`5`	`// Declare the smart pointer.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`void COMAutomationSmartPointerDemo()`
`2`	`2`	`{`
`3`		`-`
`4`	`3`	`CComPtr<IDispatch> pWord;`
`5`	`4`	`CComQIPtr<IDispatch, &IID_IDispatch> pqi = pWord;`
`6`	`5`	`CComDispatchDriver pDriver = pqi;`
Original file line number	Diff line number	Diff line change
@@ -23,7 +23,6 @@ Because a lambda expression is typed, you can assign it to an `auto` variabl
`23`	`23`
`24`	`24`	`int main()`
`25`	`25`	`{`
`26`		`-`
`27`	`26`	`using namespace std;`
`28`	`27`
`29`	`28`	`// Assign the lambda expression that adds two numbers to an auto variable.`
Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,6 @@ using namespace std;`
`401`	`401`
`402`	`402`	`class C`
`403`	`403`	`{`
`404`		`-`
`405`	`404`	`public:`
`406`	`405`	`C() {/expensive initialization/}`
`407`	`406`	`vector<unsigned> get_data() &`