Skip to content

Commit 375ef22

Browse files
definedriskdefinedrisk
authored
Merge pull request MicrosoftDocs#1 from MicrosoftDocs/master
Pulling upstream changes to master
2 parents 4fa8b5a + 33949c8 commit 375ef22

2,556 files changed

Lines changed: 20120 additions & 18028 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.markdownlint.json‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,32 @@
11
{
22
"default": true,
3-
"MD002": false,
43
"DOCSMD006": false,
4+
"MD001": false,
55
"MD013": false,
6-
"MD024": { "siblings_only": true },
7-
"MD025": { "front_matter_title": "" },
6+
"MD024": {
7+
"siblings_only": true
8+
},
9+
"MD025": {
10+
"front_matter_title": ""
11+
},
812
"MD026": false,
913
"MD028": false,
10-
"MD038": false,
11-
"MD033": { "allowed_elements": ["a", "br", "em", "strong", "sub", "sup"] }
12-
}
14+
"MD033": {
15+
"allowed_elements": [
16+
"a",
17+
"br",
18+
"em",
19+
"iframe",
20+
"strong",
21+
"sub",
22+
"sup"
23+
]
24+
},
25+
"MD036": false,
26+
"MD037": false,
27+
"MD040": false,
28+
"MD041": false,
29+
"MD046": {
30+
"style": "fenced"
31+
}
32+
}

‎.openpublishing.redirection.json‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -107,22 +107,22 @@
107107
},
108108
{
109109
"source_path": "docs/assembler/arm/index.md",
110-
"redirect_url": "/cpp/assembler/arm/arm-assembler-reference",
110+
"redirect_url": "/cpp/intrinsics/index",
111111
"redirect_document_id": false
112112
},
113113
{
114114
"source_path": "docs/assembler/index.md",
115-
"redirect_url": "/cpp/assembler/masm/microsoft-macro-assembler-reference",
115+
"redirect_url": "/cpp/intrinsics/index",
116116
"redirect_document_id": false
117117
},
118118
{
119119
"source_path": "docs/assembler/inline/index.md",
120-
"redirect_url": "/cpp/assembler/inline/inline-assembler",
120+
"redirect_url": "/cpp/intrinsics/index",
121121
"redirect_document_id": false
122122
},
123123
{
124124
"source_path": "docs/assembler/masm/index.md",
125-
"redirect_url": "/cpp/assembler/masm/microsoft-macro-assembler-reference",
125+
"redirect_url": "/cpp/intrinsics/index",
126126
"redirect_document_id": false
127127
},
128128
{
@@ -701,13 +701,13 @@
701701
"redirect_document_id": false
702702
},
703703
{
704-
"source_path": "docs/c-language/index.md",
705-
"redirect_url": "/cpp/c-language/c-language-reference",
704+
"source_path": "docs/cloud/index.md",
705+
"redirect_url": "/cpp/cloud/cloud-and-web-programming-in-visual-cpp",
706706
"redirect_document_id": false
707707
},
708708
{
709-
"source_path": "docs/cloud/index.md",
710-
"redirect_url": "/cpp/cloud/cloud-and-web-programming-in-visual-cpp",
709+
"source_path": "docs/code-quality/cpp-core-guidelines-warnings.md",
710+
"redirect_url": "/cpp/code-quality/using-the-cpp-core-guidelines-checkers",
711711
"redirect_document_id": false
712712
},
713713
{
@@ -760,11 +760,6 @@
760760
"redirect_url": "/cpp/cpp/character-sets",
761761
"redirect_document_id": false
762762
},
763-
{
764-
"source_path": "docs/cpp/index.md",
765-
"redirect_url": "/cpp/cpp/cpp-language-reference",
766-
"redirect_document_id": false
767-
},
768763
{
769764
"source_path": "docs/cpp/using-wmain-instead-of-main.md",
770765
"redirect_url": "/cpp/cpp/main-function-command-line-args",
@@ -7500,11 +7495,6 @@
75007495
"redirect_url": "/cpp/build/how-to-create-a-cpp-project-from-existing-code",
75017496
"redirect_document_id": false
75027497
},
7503-
{
7504-
"source_path": "docs/intrinsics/index.md",
7505-
"redirect_url": "/cpp/intrinsics/compiler-intrinsics",
7506-
"redirect_document_id": false
7507-
},
75087498
{
75097499
"source_path": "docs/mfc/active-documents-on-the-internet.md",
75107500
"redirect_url": "/cpp/mfc/activex-controls",

‎docs/_breadcrumb/toc.yml‎

Lines changed: 114 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -2,118 +2,121 @@
22
tocHref: /
33
topicHref: /
44
items:
5-
- name: Microsoft C++
5+
- name: Microsoft C++, C, and Assembler
66
tocHref: /cpp/
7-
topicHref: /cpp
7+
topicHref: /cpp/index
88
items:
9-
- name: Documentation
10-
tocHref: /cpp/
11-
topicHref: /cpp/overview/visual-cpp-in-visual-studio
9+
- name: Compiler intrinsics and assembly language
10+
tocHref: /cpp/intrinsics/
11+
topicHref: /cpp/intrinsics/index
1212
items:
13-
- name: C++ language
14-
tocHref: /cpp/cpp/
15-
topicHref: /cpp/cpp/cpp-language-reference
16-
- name: C Language
17-
tocHref: /cpp/c-language/
18-
topicHref: /cpp/c-language/c-language-reference
19-
- name: C/C++ preprocessor
20-
tocHref: /cpp/preprocessor/
21-
topicHref: /cpp/preprocessor/c-cpp-preprocessor-reference
22-
- name: Compiler intrinsics and assembly language
13+
- name: Compiler intrinsics
2314
tocHref: /cpp/intrinsics/
24-
topicHref: /cpp/intrinsics/compiler-intrinsics-and-assembly-language
25-
items:
26-
- name: ARM
27-
tocHref: /cpp/assembler/arm/
28-
topicHref: /cpp/assembler/arm/arm-assembler-reference
29-
- name: Inline assembler
30-
tocHref: /cpp/assembler/inline/
31-
topicHref: /cpp/assembler/inline/inline-assembler
32-
- name: MASM
33-
tocHref: /cpp/assembler/masm/
34-
topicHref: /cpp/assembler/masm/microsoft-macro-assembler-reference
35-
- name: C runtime library
36-
tocHref: /cpp/c-runtime-library/
37-
topicHref: /cpp/c-runtime-library/c-run-time-library-reference
38-
items:
39-
- name: Reference
40-
tocHref: /cpp/c-runtime-library/reference/
41-
topicHref: /cpp/c-runtime-library/reference/crt-alphabetical-function-reference
42-
- name: C++ standard library
43-
tocHref: /cpp/standard-library/
44-
topicHref: /cpp/standard-library/cpp-standard-library-reference
45-
- name: Windows
46-
tocHref: /cpp/windows/
47-
topicHref: /cpp/windows/overview-of-windows-programming-in-cpp
48-
items:
49-
- name: ATL
50-
tocHref: /cpp/atl/
51-
topicHref: /cpp/atl/atl-com-desktop-components
52-
- name: MFC
53-
tocHref: /cpp/mfc/
54-
topicHref: /cpp/mfc/mfc-desktop-applications
55-
items:
56-
- name: Reference
57-
tocHref: /cpp/mfc/reference/
58-
topicHref: /cpp/mfc/reference/mfc-classes
59-
- name: ATL/MFC shared classes
60-
tocHref: /cpp/atl-mfc-shared/
61-
topicHref: /cpp/atl-mfc-shared/atl-mfc-shared-classes
62-
items:
63-
- name: Reference
64-
tocHref: /cpp/atl-mfc-shared/reference/
65-
topicHref: /cpp/atl-mfc-shared/reference/classes-shared-by-mfc-and-atl
66-
- name: C++/CX
67-
tocHref: /cpp/cppcx/
68-
topicHref: /cpp/cppcx/visual-c-language-reference-c-cx
69-
- name: Linux
70-
tocHref: /cpp/linux/
71-
topicHref: /cpp/linux/download-install-and-setup-the-linux-development-workload
72-
- name: .NET
73-
tocHref: /cpp/dotnet/
74-
topicHref: /cpp/dotnet/dotnet-programming-with-cpp-cli-visual-cpp
75-
- name: Parallel programming
76-
tocHref: /cpp/parallel/
77-
topicHref: /cpp/parallel/parallel-programming-in-visual-cpp
78-
- name: Data access
79-
tocHref: /cpp/data/
80-
topicHref: /cpp/data/data-access-in-cpp
81-
items:
82-
- name: OLEDB
83-
tocHref: /cpp/data/oledb/
84-
topicHref: /cpp/data/oledb/ole-db-programming
85-
- name: ODBC
86-
tocHref: /cpp/data/odbc/
87-
topicHref: /cpp/data/odbc/open-database-connectivity-odbc
88-
- name: Edit, navigate, and refactor code
89-
tocHref: /cpp/ide
90-
topicHref: /cpp/ide/read-and-understand-code-cpp
91-
items:
92-
- name: IDE
93-
tocHref: /cpp/ide/
94-
topicHref: /cpp/ide/using-the-visual-studio-ide-for-cpp-desktop-development
95-
- name: Building C/C++ projects
96-
tocHref: /cpp/build/
97-
topicHref: /cpp/build/building-c-cpp-programs
98-
items:
99-
- name: Build reference
100-
tocHref: /cpp/build/reference/
101-
topicHref: /cpp/build/reference/c-cpp-building-reference
102-
- name: Build insights
103-
tocHref: /cpp/build-insights/
104-
topicHref: /cpp/build-insights/get-started-with-cpp-build-insights
105-
- name: Errors and warnings
106-
tocHref: /cpp/error-messages/
107-
topicHref: /cpp/error-messages/compiler-errors-1/c-cpp-build-errors
108-
- name: Porting and upgrading
109-
tocHref: /cpp/porting/
110-
topicHref: /cpp/porting/visual-cpp-porting-and-upgrading-guide
111-
- name: Text and strings
112-
tocHref: /cpp/text/
113-
topicHref: /cpp/text/text-and-strings-in-visual-cpp
114-
- name: Security
115-
tocHref: /cpp/security
116-
topicHref: /cpp/security/security-best-practices-for-cpp
117-
- name: Cloud and web
118-
tocHref: /cpp/cloud
119-
topicHref: /cpp/cloud/cloud-and-web-programming-in-visual-cpp
15+
topicHref: /cpp/intrinsics/compiler-intrinsics
16+
- name: ARM and ARM64 assembler
17+
tocHref: /cpp/assembler/arm/
18+
topicHref: /cpp/assembler/arm/arm-assembler-reference
19+
- name: C/C++ x86 inline assembler
20+
tocHref: /cpp/assembler/inline/
21+
topicHref: /cpp/assembler/inline/inline-assembler
22+
- name: x86 and x64 assembler
23+
tocHref: /cpp/assembler/masm/
24+
topicHref: /cpp/assembler/masm/microsoft-macro-assembler-reference
25+
- name: ATL
26+
tocHref: /cpp/atl/
27+
topicHref: /cpp/atl/atl-com-desktop-components
28+
- name: ATL/MFC shared classes
29+
tocHref: /cpp/atl-mfc-shared/
30+
topicHref: /cpp/atl-mfc-shared/atl-mfc-shared-classes
31+
items:
32+
- name: ATL/MFC reference
33+
tocHref: /cpp/atl-mfc-shared/reference/
34+
topicHref: /cpp/atl-mfc-shared/reference/classes-shared-by-mfc-and-atl
35+
- name: Build C/C++ projects
36+
tocHref: /cpp/build/
37+
topicHref: /cpp/build/building-c-cpp-programs
38+
items:
39+
- name: Build reference
40+
tocHref: /cpp/build/reference/
41+
topicHref: /cpp/build/reference/c-cpp-building-reference
42+
- name: Build insights
43+
tocHref: /cpp/build-insights/
44+
topicHref: /cpp/build-insights/index
45+
- name: C language
46+
tocHref: /cpp/c-language/
47+
topicHref: /cpp/c-language/index
48+
- name: C runtime library
49+
tocHref: /cpp/c-runtime-library/
50+
topicHref: /cpp/c-runtime-library/c-run-time-library-reference
51+
items:
52+
- name: UCRT reference
53+
tocHref: /cpp/c-runtime-library/reference/
54+
topicHref: /cpp/c-runtime-library/reference/crt-alphabetical-function-reference
55+
- name: Cloud and web
56+
tocHref: /cpp/cloud/
57+
topicHref: /cpp/cloud/cloud-and-web-programming-in-visual-cpp
58+
- name: Code analysis
59+
tocHref: /cpp/code-quality/
60+
topicHref: /cpp/code-quality/index
61+
- name: C++ language
62+
tocHref: /cpp/cpp/
63+
topicHref: /cpp/cpp/index
64+
- name: C++/CX
65+
tocHref: /cpp/cppcx/
66+
topicHref: /cpp/cppcx/visual-c-language-reference-c-cx
67+
- name: Cross-platform mobile development
68+
tocHref: /cpp/cross-platform/
69+
topicHref: /cpp/cross-platform/index
70+
- name: Data access
71+
tocHref: /cpp/data/
72+
topicHref: /cpp/data/data-access-in-cpp
73+
items:
74+
- name: OLEDB
75+
tocHref: /cpp/data/oledb/
76+
topicHref: /cpp/data/oledb/ole-db-programming
77+
- name: ODBC
78+
tocHref: /cpp/data/odbc/
79+
topicHref: /cpp/data/odbc/open-database-connectivity-odbc
80+
- name: C++/CLI for .NET
81+
tocHref: /cpp/dotnet/
82+
topicHref: /cpp/dotnet/dotnet-programming-with-cpp-cli-visual-cpp
83+
- name: Errors and warnings
84+
tocHref: /cpp/error-messages/
85+
topicHref: /cpp/error-messages/compiler-errors-1/c-cpp-build-errors
86+
- name: Edit, navigate, and refactor code
87+
tocHref: /cpp/ide/
88+
topicHref: /cpp/ide/read-and-understand-code-cpp
89+
- name: Linux
90+
tocHref: /cpp/linux/
91+
topicHref: /cpp/linux/index
92+
- name: MFC
93+
tocHref: /cpp/mfc/
94+
topicHref: /cpp/mfc/mfc-desktop-applications
95+
items:
96+
- name: MFC reference
97+
tocHref: /cpp/mfc/reference/
98+
topicHref: /cpp/mfc/reference/mfc-classes
99+
- name: Microsoft C/C++
100+
tocHref: /cpp/overview/
101+
topicHref: /cpp/overview/visual-cpp-in-visual-studio
102+
- name: Parallel programming
103+
tocHref: /cpp/parallel/
104+
topicHref: /cpp/parallel/parallel-programming-in-visual-cpp
105+
- name: Porting and upgrading
106+
tocHref: /cpp/porting/
107+
topicHref: /cpp/porting/visual-cpp-porting-and-upgrading-guide
108+
- name: C/C++ preprocessor
109+
tocHref: /cpp/preprocessor/
110+
topicHref: /cpp/preprocessor/c-cpp-preprocessor-reference
111+
- name: Security
112+
tocHref: /cpp/security/
113+
topicHref: /cpp/security/security-best-practices-for-cpp
114+
- name: C++ standard library
115+
tocHref: /cpp/standard-library/
116+
topicHref: /cpp/standard-library/cpp-standard-library-reference
117+
- name: Text and strings
118+
tocHref: /cpp/text/
119+
topicHref: /cpp/text/text-and-strings-in-visual-cpp
120+
- name: Windows
121+
tocHref: /cpp/windows/
122+
topicHref: /cpp/windows/overview-of-windows-programming-in-cpp

‎docs/assembler/inline/accessing-c-or-cpp-data-in-asm-blocks.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ ms.assetid: e99f5a28-0381-4090-8ece-6af8f2436a49
88

99
**Microsoft Specific**
1010

11-
A great convenience of inline assembly is the ability to refer to C or C++ variables by name. An `__asm` block can refer to any symbols, including variable names, that are in scope where the block appears. For instance, if the C variable `var` is in scope, the instruction
11+
A great convenience of inline assembly is the ability to refer to C or C++ variables by name. An **`__asm`** block can refer to any symbols, including variable names, that are in scope where the block appears. For instance, if the C variable `var` is in scope, the instruction
1212

1313
```cpp
1414
__asm mov eax, var
1515
```
1616

1717
stores the value of `var` in EAX.
1818

19-
If a class, structure, or union member has a unique name, an `__asm` block can refer to it using only the member name, without specifying the variable or `typedef` name before the period (**.**) operator. If the member name is not unique, however, you must place a variable or `typedef` name immediately before the period operator. For example, the structure types in the following sample share `same_name` as their member name:.
19+
If a class, structure, or union member has a unique name, an **`__asm`** block can refer to it using only the member name, without specifying the variable or **`typedef`** name before the period (**.**) operator. If the member name is not unique, however, you must place a variable or **`typedef`** name immediately before the period operator. For example, the structure types in the following sample share `same_name` as their member name:.
2020

2121
If you declare variables with the types
2222

0 commit comments

Comments
 (0)