Merge branch 'master' into add-desc-08

Author: v-kents

docs/atl-mfc-shared/reference/cstringt-class.md

@@ -1,11 +1,11 @@
 ---
 title: "**`CStringT`** Class"
 description: "API reference for the Microsoft ATL **`CStringT`** class"
-ms.date: "11/13/2020"
-f1_keywords: ["CStringT", "ATLSTR/ATL::CStringT", "ATLSTR/ATL::CStringT::CStringT", "ATLSTR/ATL::CStringT::AllocSysString", "ATLSTR/ATL::CStringT::AnsiToOem", "ATLSTR/ATL::CStringT::AppendFormat", "ATLSTR/ATL::CStringT::Collate", "ATLSTR/ATL::CStringT::CollateNoCase", "ATLSTR/ATL::CStringT::Compare", "ATLSTR/ATL::CStringT::CompareNoCase", "ATLSTR/ATL::CStringT::Delete", "ATLSTR/ATL::CStringT::Find", "ATLSTR/ATL::CStringT::FindOneOf", "ATLSTR/ATL::CStringT::Format", "ATLSTR/ATL::CStringT::FormatMessage", "ATLSTR/ATL::CStringT::FormatMessageV", "ATLSTR/ATL::CStringT::FormatV", "ATLSTR/ATL::CStringT::GetEnvironmentVariable", "ATLSTR/ATL::CStringT::Insert", "ATLSTR/ATL::CStringT::Left", "ATLSTR/ATL::CStringT::LoadString", "ATLSTR/ATL::CStringT::MakeLower", "ATLSTR/ATL::CStringT::MakeReverse", "ATLSTR/ATL::CStringT::MakeUpper", "ATLSTR/ATL::CStringT::Mid", "ATLSTR/ATL::CStringT::OemToAnsi", "ATLSTR/ATL::CStringT::Remove", "ATLSTR/ATL::CStringT::Replace", "ATLSTR/ATL::CStringT::ReverseFind", "ATLSTR/ATL::CStringT::Right", "ATLSTR/ATL::CStringT::SetSysString", "ATLSTR/ATL::CStringT::SpanExcluding", "ATLSTR/ATL::CStringT::SpanIncluding", "ATLSTR/ATL::CStringT::Tokenize", "ATLSTR/ATL::CStringT::Trim", "ATLSTR/ATL::CStringT::TrimLeft", "ATLSTR/ATL::CStringT::TrimRight", "CSTRINGT/CStringT", "CSTRINGT/CStringT::CStringT", "CSTRINGT/CStringT::AllocSysString", "CSTRINGT/CStringT::AnsiToOem", "CSTRINGT/CStringT::AppendFormat", "CSTRINGT/CStringT::Collate", "CSTRINGT/CStringT::CollateNoCase", "CSTRINGT/CStringT::Compare", "CSTRINGT/CStringT::CompareNoCase", "CSTRINGT/CStringT::Delete", "CSTRINGT/CStringT::Find", "CSTRINGT/CStringT::FindOneOf", "CSTRINGT/CStringT::Format", "CSTRINGT/CStringT::FormatMessage", "CSTRINGT/CStringT::FormatMessageV", "CSTRINGT/CStringT::FormatV", "CSTRINGT/CStringT::GetEnvironmentVariable", "CSTRINGT/CStringT::Insert", "CSTRINGT/CStringT::Left", "CSTRINGT/CStringT::LoadString", "CSTRINGT/CStringT::MakeLower", "CSTRINGT/CStringT::MakeReverse", "CSTRINGT/CStringT::MakeUpper", "CSTRINGT/CStringT::Mid", "CSTRINGT/CStringT::OemToAnsi", "CSTRINGT/CStringT::Remove", "CSTRINGT/CStringT::Replace", "CSTRINGT/CStringT::ReverseFind", "CSTRINGT/CStringT::Right", "CSTRINGT/CStringT::SetSysString", "CSTRINGT/CStringT::SpanExcluding", "CSTRINGT/CStringT::SpanIncluding", "CSTRINGT/CStringT::Tokenize", "CSTRINGT/CStringT::Trim", "CSTRINGT/CStringT::TrimLeft", "CSTRINGT/CStringT::TrimRight"]
+ms.date: 12/06/2020
+f1_keywords: ["CStringT", "CSTRINGT/ATL::CStringT", "CSTRINGT/ATL::CStringT::CStringT", "CSTRINGT/ATL::CStringT::AllocSysString", "CSTRINGT/ATL::CStringT::AnsiToOem", "CSTRINGT/ATL::CStringT::AppendFormat", "CSTRINGT/ATL::CStringT::Collate", "CSTRINGT/ATL::CStringT::CollateNoCase", "CSTRINGT/ATL::CStringT::Compare", "CSTRINGT/ATL::CStringT::CompareNoCase", "CSTRINGT/ATL::CStringT::Delete", "CSTRINGT/ATL::CStringT::Find", "CSTRINGT/ATL::CStringT::FindOneOf", "CSTRINGT/ATL::CStringT::Format", "CSTRINGT/ATL::CStringT::FormatMessage", "CSTRINGT/ATL::CStringT::FormatMessageV", "CSTRINGT/ATL::CStringT::FormatV", "CSTRINGT/ATL::CStringT::GetEnvironmentVariable", "CSTRINGT/ATL::CStringT::Insert", "CSTRINGT/ATL::CStringT::Left", "CSTRINGT/ATL::CStringT::LoadString", "CSTRINGT/ATL::CStringT::MakeLower", "CSTRINGT/ATL::CStringT::MakeReverse", "CSTRINGT/ATL::CStringT::MakeUpper", "CSTRINGT/ATL::CStringT::Mid", "CSTRINGT/ATL::CStringT::OemToAnsi", "CSTRINGT/ATL::CStringT::Remove", "CSTRINGT/ATL::CStringT::Replace", "CSTRINGT/ATL::CStringT::ReverseFind", "CSTRINGT/ATL::CStringT::Right", "CSTRINGT/ATL::CStringT::SetSysString", "CSTRINGT/ATL::CStringT::SpanExcluding", "CSTRINGT/ATL::CStringT::SpanIncluding", "CSTRINGT/ATL::CStringT::Tokenize", "CSTRINGT/ATL::CStringT::Trim", "CSTRINGT/ATL::CStringT::TrimLeft", "CSTRINGT/ATL::CStringT::TrimRight"]
 helpviewer_keywords: ["strings [C++], in ATL", "shared classes, CStringT", "CStringT class"]
 ---
-# CStringT Class
+# `CStringT` Class
 
 This class represents a **`CStringT`** object.
 
@@ -493,7 +493,7 @@ Because the constructors copy the input data into new allocated storage, memory
 - **`CStringT`**( `const unsigned char*` `psz` ): Allows you to construct a **`CStringT`** from a pointer to **`unsigned char`**.
 
 > [!NOTE]
-> Define the` _CSTRING_DISABLE_NARROW_WIDE_CONVERSION` macro to turn off implicit string conversion between ANSI and Unicode strings. The macro excludes from compilation constructors that support conversion.
+> Define the `_CSTRING_DISABLE_NARROW_WIDE_CONVERSION` macro to turn off implicit string conversion between ANSI and Unicode strings. The macro excludes from compilation constructors that support conversion.
 
 The *`strSrc`* parameter can be either a **`CStringT`** or `CThisSimpleString` object. For **`CStringT`**, use one of its default instantiations (`CString`, `CStringA`, or `CStringW`); for `CThisSimpleString`, use a **`this`** pointer. `CThisSimpleString` declares an instance of the [CSimpleStringT Class](../../atl-mfc-shared/reference/csimplestringt-class.md), which is a smaller string class with less built-in functionality than the **`CStringT`** class.
 
@@ -1560,8 +1560,6 @@ Unlike the CRT tokenize functions like [`strtok_s, _strtok_s_l, wcstok_s, _wcsto
 
 [!code-cpp[NVC_ATLMFC_Utilities#135](../../atl-mfc-shared/codesnippet/cpp/cstringt-class_39.cpp)]
 
-### Remarks
-
 The output from this example is as follows:
 
 ```Output
@@ -1606,8 +1604,6 @@ Removes all leading and trailing occurrences of one of the following:
 
 [!code-cpp[NVC_ATLMFC_Utilities#136](../../atl-mfc-shared/codesnippet/cpp/cstringt-class_40.cpp)]
 
-### Remarks
-
 The output from this example is as follows:
 
 ```Output

docs/build/configure-cmake-debugging-sessions.md

@@ -1,7 +1,7 @@
 ---
 title: "Configure CMake debugging sessions in Visual Studio"
 description: "Describes how to use Visual Studio to configure CMake debugger settings."
-ms.date: "04/02/2020"
+ms.date: "12/07/2020"
 helpviewer_keywords: ["CMake debugging"]
 ---
 # Configure CMake debugging sessions
@@ -105,6 +105,8 @@ In Visual Studio 2019 version 16.6, we added a new debug configuration of `type:
 #### Additional options allowed with the `gdbserver` configuration (16.7 or later)
 
 - `program`: Defaults to `"${debugInfo.fullTargetPath}"`. The Unix path to the application to debug. Only required if different than the target executable in the build or deploy location.
+> [!TIP]
+> Deploy is not yet supported for local cross-compilation scenarios. If you are cross-compiling on Windows (for example, using a cross-compiler on Windows to build a Linux ARM executable) then you'll need to manually copy the binary to the location specified by `program` on the remote ARM machine before debugging.
 - `remoteMachineName`:  Defaults to `"${debugInfo.remoteMachineName}"`. Name of the remote system that hosts the program to debug. Only required if different than the build system. Must have an existing entry in the [Connection Manager](../linux/connect-to-your-remote-linux-computer.md). Press **Ctrl+Space** to view a list of all existing remote connections.
 - `cwd`: Defaults to `"${debugInfo.defaultWorkingDirectory}"`. Full Unix path to the directory on the remote system where `program` is run. The directory must exist.
 - `gdbPath`: Defaults to `${debugInfo.vsInstalledGdb}`. Full Windows path to the `gdb` used to debug. Defaults to the `gdb` installed with the Linux development with C/C++ workload.

docs/build/vcpkg.md

@@ -221,6 +221,8 @@ The vcpkg package manager is updated regularly on GitHub. To update your clone o
 
 To uninstall vcpkg, just delete the vcpkg directory. Deleting this directory uninstalls the vcpkg distribution, and all the libraries that vcpkg has installed.
 
+However if you have executed **`vcpkg integrate install`** you should execute **`vcpkg integrate remove`** to ensure the integration is cleaned, before the folder is removed.
+
 ## Send feedback about vcpkg
 
 Use the **`vcpkg contact --survey`** command to send feedback to Microsoft about vcpkg, including bug reports and suggestions for features.

docs/c-language/c-keywords.md

@@ -1,9 +1,8 @@
 ---
 title: "C Keywords"
 description: "Keywords in Standard C and Microsoft C compiler extensions."
-ms.date: 10/30/2020
+ms.date: "12/8/2020"
 helpviewer_keywords: ["keywords [C]", "redefining keywords", "Microsoft-specific keywords"]
-ms.assetid: 2d932335-97bf-45cd-b367-4ae00db0ff42
 ---
 # C Keywords
 
@@ -60,7 +59,7 @@ The C language uses the following keywords:
         **`_Atomic`** <sup>2, b</sup>\
         **`_Bool`** <sup>1, a</sup>\
         **`_Complex`** <sup>1, b</sup>\
-        **`_Generic`** <sup>2, a</sup>\
+        **[`_Generic`](generic_selection.md)** <sup>2, a</sup>\
         **`_Imaginary`** <sup>1, b</sup>\
         **`_Noreturn`** <sup>2, a</sup>\
         **`_Static_assert`** <sup>2, a</sup>\

docs/c-language/c-primary-expressions.md

@@ -1,25 +1,27 @@
 ---
-title: "C Primary Expressions"
-ms.date: "10/21/2018"
+title: "C primary expressions"
+description: "Explain what a C primary expression is"
+ms.date: "12/08/2020"
 helpviewer_keywords: ["primary expressions"]
-ms.assetid: 49ac134f-0f8a-44f7-800e-86f31f2bd51c
 ---
-# C Primary Expressions
+# C primary expressions
 
-The operands in expressions are called "primary expressions."
+Primary expressions are the building blocks of more complex expressions. They may be constants, identifiers, a [Generic selection](generic_selection.md), or an expression in parentheses.
 
 ## Syntax
 
-*primary-expression*:<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;*identifier*<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;*constant*<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;*string-literal*<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;**(** *expression* **)**
+*`primary-expression`*:\
+&nbsp;&nbsp;&nbsp;&nbsp;*`identifier`*\
+&nbsp;&nbsp;&nbsp;&nbsp;*`constant`*\
+&nbsp;&nbsp;&nbsp;&nbsp;*`string-literal`*\
+&nbsp;&nbsp;&nbsp;&nbsp;**(** *`expression`* **)**\
+&nbsp;&nbsp;&nbsp;&nbsp;*`generic-selection`*
 
-*expression*:<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;*assignment-expression*<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;*expression* **,** *assignment-expression*
+*expression*:\
+&nbsp;&nbsp;&nbsp;&nbsp;*`assignment-expression`*\
+&nbsp;&nbsp;&nbsp;&nbsp;*`expression`***,** *`assignment-expression`*
 
 ## See also
 
+[Generic selection](generic_selection.md)
 [Operands and Expressions](../c-language/operands-and-expressions.md)

docs/c-language/data-type-specifiers-and-equivalents.md

@@ -1,14 +1,14 @@
 ---
-title: "Data Type Specifiers and Equivalents"
+title: "Data type specifiers and equivalents"
+description: "Describes Microsoft Visual C data type specifiers and their equivalents."
 ms.date: "11/04/2016"
 helpviewer_keywords: ["type specifiers [C++], list", "widening integers", "data types [C++], equivalents", "sign-extending integral types", "zero-extending", "identifiers, data type", "data types [C++], specifiers", "simple types, names", "type names [C++], simple"]
-ms.assetid: 0d4b515a-4f68-4786-83cf-a5d43c7cb6f3
 ---
-# Data Type Specifiers and Equivalents
+# Data type specifiers and equivalents
 
-This book generally uses the forms of the type specifiers listed in the following table rather than the long forms, and it assumes that the **`char`** type is signed by default. Therefore, throughout this book, **`char`** is equivalent to **`signed char`**.
+This documentation generally uses the forms of the type specifiers listed in the following table rather than the long forms. It also assumes that the **`char`** type is signed by default. Throughout this documentation, **`char`** is equivalent to **`signed char`**.
 
-## Type Specifiers and Equivalents
+## Type specifiers and equivalents
 
 | Type Specifier | Equivalent(s) |
 |--|--|
@@ -23,15 +23,15 @@ This book generally uses the forms of the type specifiers listed in the followin
 | **`float`** | — |
 | **`long double`**<sup>2</sup> | — |
 
-<sup>1</sup> When you make the **`char`** type unsigned by default (by specifying the **`/J`** compiler option), you cannot abbreviate **`signed char`** as **`char`**.
+<sup>1</sup> When you make the **`char`** type unsigned by default (by specifying the **`/J`** compiler option), you can't abbreviate **`signed char`** as **`char`**.
 
 <sup>2</sup> In 32-bit and 64-bit operating systems, the Microsoft C compiler maps **`long double`** to type **`double`**.
 
-**Microsoft Specific**
+**Microsoft specific**
 
-You can specify the **`/J`** compiler option to change the default **`char`** type from **`signed char`** to **`unsigned char`**. When this option is in effect, **`char`** means the same as **`unsigned char`**, and you must use the **`signed`** keyword to declare a signed character value. If a **`char`** value is explicitly declared **`signed`**, the **`/J`** option does not affect it, and the value is sign-extended when widened to an **`int`** type. The **`char`** type is zero-extended when widened to **`int`** type.
+You can specify the **`/J`** compiler option to change the default **`char`** type from **`signed char`** to **`unsigned char`**. When this option is in effect, **`char`** means the same as **`unsigned char`**, and you must use the **`signed`** keyword to declare a signed character value. If a **`char`** value is explicitly declared **`signed`**, the **`/J`** option doesn't affect it, and the value is sign-extended when widened to an **`int`** type. The **`char`** type is zero-extended when widened to **`int`** type.
 
-**END Microsoft Specific**
+**END Microsoft specific**
 
 ## See also
 

docs/c-language/generic_selection.md

@@ -0,0 +1,76 @@
+---
+title: "Generic selection (C11)"
+description: "Describes the C11 _Generic keyword used in the Microsoft Visual C compiler"
+ms.date: "12/9/2020"
+helpviewer_keywords: ["_Generic keyword [C]"]
+---
+
+# Generic selection (C11)
+
+Use the **`_Generic`** keyword to write code that selects an expression at compile time based on the type of the argument. It's similar to overloading in C++ where the type of the argument selects which function to call, except that the type of the argument selects which expression to evaluate.
+
+For example, the expression `_Generic(42, int: "integer", char: "character", default: "unknown");` evaluates the type of `42` and looks for the matching type, `int`, in the list. It finds it and returns `"integer"`.
+
+## Syntax
+
+*`generic-selection`*:\
+    **`_Generic`** **(** *`assignment-expression`, `assoc-list`* **)**
+
+*`assoc-list`*:\
+    *`association`*\
+    *`assoc-list`, `association`*
+
+*`association`*:\
+    *`type-name`* : *`assignment-expression`*\
+    **`default`** : *`assignment-expression`*
+
+The first *`assignment-expression`* is called the controlling expression. The type of the controlling expression is determined at compile time and matched against the *`assoc-list`* to find which expression to evaluate and return. The controlling expression is not evaluated. For example, `_Generic(intFunc(), int: "integer", default: "error");` doesn't result in a call at runtime to `intFunc()`. 
+
+When the type of the controlling expression is determined, `const`,  `volatile`, and `restrict` are removed before matching against *`assoc-list`*.
+
+Entries in the `assoc-list` that aren't chosen aren't evaluated.
+
+## Constraints
+
+- The *`assoc-list`* can't specify the same type more than once.
+- The *`assoc-list`* can't specify types that are compatible with each other, such as an enumeration and the underlying type of that enumeration.
+- If a generic selection doesn't have a default, the controlling expression must have only one compatible type name in the generic association list.
+
+## Example
+
+One way to use **`_Generic`** is in a macro. The <tgmath.h> header file uses **_Generic** to call the right math function depending on the type of argument. For example, the macro for `cos()` maps a call with a float to `cosf()`, while mapping a call with a complex double to `ccos()`.
+
+The following example shows how to write a macro that identifies the type of the argument you pass to it. It produces `"unknown"` if no entry in the *`assoc-list`* matches the controlling expression:
+
+```C
+// Compile with /std:c11
+
+#include <stdio.h>
+
+/* Get a type name string for the argument x */
+#define TYPE_NAME(X) _Generic((X), \
+      int: "int", \
+      char: "char", \
+      double: "double", \
+      default: "unknown")
+
+int main()
+{
+    printf("Type name: %s\n", TYPE_NAME(42.42));
+
+    // The following would result in a compile error because 
+    // 42.4 is a double, doesn't match anything in the list, 
+    // and there is no default.
+    // _Generic(42.4, int: "integer", char: "character"));
+}
+
+/* Output:
+Type name: double
+*/
+
+```
+
+## See also
+
+[`/std` (Specify Language Standard Version)](../build/reference/std-specify-language-standard-version.md)\
+[Type-generic math](../c-runtime-library/tgmath.md)

docs/c-language/toc.yml

@@ -270,6 +270,8 @@
                 href: ../c-language/string-literals-in-primary-expressions.md
               - name: Expressions in parentheses
                 href: ../c-language/expressions-in-parentheses.md
+              - name: Generic selection (C11)
+                href: ../c-language/generic_selection.md
           - name: L-value and r-value expressions
             href: ../c-language/l-value-and-r-value-expressions.md
           - name: C constant expressions