Skip to content

Commit 7a62d77

Browse files
author
Colin Robertson
authored
Merge pull request MicrosoftDocs#2569 from MicrosoftDocs/master637399408116430502
Repo sync for protected CLA branch
2 parents d11ab8e + 4abc6c4 commit 7a62d77

16 files changed

+715
-615
lines changed

.openpublishing.redirection.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,41 @@
700700
"redirect_url": "/cpp/build-insights/reference/wpa-views",
701701
"redirect_document_id": false
702702
},
703+
{
704+
"source_path": "docs/c-language/operators-c.md",
705+
"redirect_url": "/cpp/c-language/lexical-grammar",
706+
"redirect_document_id": false
707+
},
708+
{
709+
"source_path": "docs/c-language/punctuators.md",
710+
"redirect_url": "/cpp/c-language/lexical-grammar",
711+
"redirect_document_id": false
712+
},
713+
{
714+
"source_path": "docs/c-language/summary-of-constants.md",
715+
"redirect_url": "/cpp/c-language/lexical-grammar",
716+
"redirect_document_id": false
717+
},
718+
{
719+
"source_path": "docs/c-language/summary-of-identifiers.md",
720+
"redirect_url": "/cpp/c-language/lexical-grammar",
721+
"redirect_document_id": false
722+
},
723+
{
724+
"source_path": "docs/c-language/summary-of-keywords.md",
725+
"redirect_url": "/cpp/c-language/lexical-grammar",
726+
"redirect_document_id": false
727+
},
728+
{
729+
"source_path": "docs/c-language/summary-of-string-literals.md",
730+
"redirect_url": "/cpp/c-language/lexical-grammar",
731+
"redirect_document_id": false
732+
},
733+
{
734+
"source_path": "docs/c-language/summary-of-tokens.md",
735+
"redirect_url": "/cpp/c-language/lexical-grammar",
736+
"redirect_document_id": false
737+
},
703738
{
704739
"source_path": "docs/cloud/index.md",
705740
"redirect_url": "/cpp/cloud/cloud-and-web-programming-in-visual-cpp",

docs/build/reference/std-specify-language-standard-version.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "/std (Specify Language Standard Version)"
33
description: "The MSVC compiler option /std specifies the C or C++ language standard supported by the compiler."
4-
ms.date: 09/11/2020
4+
ms.date: 10/29/2020
55
f1_keywords: ["/std", "-std", "/std:c++14", "/std:c++17", "/std:c11", "/std:c17", "VC.Project.VCCLCompilerTool.CppLanguageStandard"]
66
ms.assetid: 0acb74ba-1aa8-4c05-b96c-682988dc19bd
77
---
@@ -64,7 +64,7 @@ Starting in Visual Studio 2019 version 16.8, you may specify **`/std:c11`** or *
6464
6565
When you specify **`/std:c11`** or **`/std:c17`**, MSVC supports all the required features of C11 and C17. The compiler options enable support for these functionalities:
6666

67-
- **`_Pragma`**
67+
- [`_Pragma`](../../preprocessor/pragma-directives-and-the-pragma-keyword.md#the-_pragma-preprocessing-operator-c99-c11)
6868

6969
- **`restrict`**
7070

docs/c-language/c-assignment-operators.md

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
title: "C Assignment Operators"
3-
ms.date: "06/14/2018"
3+
description: "The standard C language assignment operators, their syntax and meaning."
4+
ms.date: 10/30/2020
45
helpviewer_keywords: ["remainder assignment operator (%=)", "&= operator", "bitwise-AND assignment operator", "operators [C], assignment", "operators [C], shift", "^= operator, assignment operators", "+= operator", ">>= operator", "|= operator", "division assignment operator", "subtraction operator", "right shift operators", "subtraction operator, C assignment operators", "= operator, assignment operators", "*= operator", ">> operator", "%= operator", "assignment operators, C", "= operator", "assignment operators", "assignment conversions", "-= operator", "multiplication assignment operator (*=)", "shift operators, right", "/= operator", "operator >>=, C assignment operators", "<<= operator"]
56
ms.assetid: 11688dcb-c941-44e7-a636-3fc98e7dac40
67
---
@@ -10,28 +11,28 @@ An assignment operation assigns the value of the right-hand operand to the stora
1011

1112
## Syntax
1213

13-
*assignment-expression*:<br/>
14-
&nbsp;&nbsp;&nbsp;&nbsp;*conditional-expression*<br/>
15-
&nbsp;&nbsp;&nbsp;&nbsp;*unary-expression* *assignment-operator* *assignment-expression*
14+
*`assignment-expression`*:\
15+
&emsp;*`conditional-expression`*\
16+
&emsp;*`unary-expression`* *`assignment-operator`* *`assignment-expression`*
1617

17-
*assignment-operator*: one of<br/>
18-
&nbsp;&nbsp;&nbsp;&nbsp;**=** **\*=** **/=** **%=** **+=** **-=** **\<\<=** **>>=** **&=** **^=** **|=**
18+
*`assignment-operator`*: one of<br/>
19+
&emsp;**`=`** **`*=`** **`/=`** **`%=`** **`+=`** **`-=`** **`<<=`** **`>>=`** **`&=`** **`^=`** **`|=`**
1920

2021
The assignment operators in C can both transform and assign values in a single operation. C provides the following assignment operators:
2122

2223
|Operator|Operation Performed|
2324
|--------------|-------------------------|
24-
|**=**|Simple assignment|
25-
|**&#42;=**|Multiplication assignment|
26-
|**/=**|Division assignment|
27-
|**%=**|Remainder assignment|
28-
|**+=**|Addition assignment|
29-
|**-=**|Subtraction assignment|
30-
|**<\<=**|Left-shift assignment|
31-
|**>>=**|Right-shift assignment|
32-
|**&=**|Bitwise-AND assignment|
33-
|**^=**|Bitwise-exclusive-OR assignment|
34-
|**&#124;=**|Bitwise-inclusive-OR assignment|
25+
|**`=`**|Simple assignment|
26+
|**`*=`**|Multiplication assignment|
27+
|**`/=`**|Division assignment|
28+
|**`%=`**|Remainder assignment|
29+
|**`+=`**|Addition assignment|
30+
|**`-=`**|Subtraction assignment|
31+
|**`<<=`**|Left-shift assignment|
32+
|**`>>=`**|Right-shift assignment|
33+
|**`&=`**|Bitwise-AND assignment|
34+
|**`^=`**|Bitwise-exclusive-OR assignment|
35+
|**`|=`**|Bitwise-inclusive-OR assignment|
3536

3637
In assignment, the type of the right-hand value is converted to the type of the left-hand value, and the value is stored in the left operand after the assignment has taken place. The left operand must not be an array, a function, or a constant. The specific conversion path, which depends on the two types, is outlined in detail in [Type Conversions](../c-language/type-conversions-c.md).
3738

docs/c-language/c-keywords.md

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "C Keywords"
33
description: "Keywords in Standard C and Microsoft C compiler extensions."
4-
ms.date: 10/15/2020
4+
ms.date: 10/30/2020
55
helpviewer_keywords: ["keywords [C]", "redefining keywords", "Microsoft-specific keywords"]
66
ms.assetid: 2d932335-97bf-45cd-b367-4ae00db0ff42
77
---
@@ -87,31 +87,30 @@ The following keywords and special identifiers are recognized by the Microsoft C
8787
:::row:::
8888
:::column:::
8989
**`__asm`**<sup>5</sup>\
90-
**`dllimport`**<sup>4</sup>\
91-
**`__int8`**<sup>5</sup>\
92-
**`naked`**<sup>4</sup>\
93-
**`__based`**<sup>3, 5</sup>
94-
:::column-end:::
95-
:::column:::
96-
**`__except`**<sup>5</sup>\
97-
**`__int16`**<sup>5</sup>\
98-
**`__stdcall`**<sup>5</sup>\
90+
**`__based`**<sup>3, 5</sup>\
9991
**`__cdecl`**<sup>5</sup>\
100-
**`__fastcall`**
92+
**`__declspec`**<sup>5</sup>\
93+
**`__except`**<sup>5</sup>\
94+
**`__fastcall`**\
95+
**`__finally`**<sup>5</sup>
10196
:::column-end:::
10297
:::column:::
98+
**`__inline`**<sup>5</sup>\
99+
**`__int16`**<sup>5</sup>\
103100
**`__int32`**<sup>5</sup>\
104-
**`thread`**<sup>4</sup>\
105-
**`__declspec`**<sup>5</sup>\
106-
**`__finally`**<sup>5</sup>\
107-
**`__int64`**<sup>5</sup>
101+
**`__int64`**<sup>5</sup>\
102+
**`__int8`**<sup>5</sup>\
103+
**`__leave`**<sup>5</sup>\
104+
**`__restrict`**
108105
:::column-end:::
109106
:::column:::
107+
**`__stdcall`**<sup>5</sup>\
110108
**`__try`**<sup>5</sup>\
111109
**`dllexport`**<sup>4</sup>\
112-
**`__inline`**<sup>5</sup>\
113-
**`__leave`**<sup>5</sup>\
114-
**`static_assert`**<sup>6</sup>
110+
**`dllimport`**<sup>4</sup>\
111+
**`naked`**<sup>4</sup>\
112+
**`static_assert`**<sup>6</sup>\
113+
**`thread`**<sup>4</sup>
115114
:::column-end:::
116115
:::row-end:::
117116

0 commit comments

Comments
 (0)