Skip to content

Commit 33657df

Browse files
author
Colin Robertson
authored
Merge branch 'master' into master
2 parents 2509c3f + 32d994b commit 33657df

4,945 files changed

Lines changed: 54761 additions & 43857 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.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ _themes/
66
_themes.MSDN.Modern/
77
_themes.VS.Modern/
88

9+
# Ignore local configuration changes
10+
.github/
911
.openpublishing.buildcore.ps1
1012
.vscode/
1113

‎.openpublishing.redirection.json‎

Lines changed: 16 additions & 16 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
{
@@ -686,8 +686,18 @@
686686
"redirect_document_id": false
687687
},
688688
{
689-
"source_path": "docs/c-language/index.md",
690-
"redirect_url": "/cpp/c-language/c-language-reference",
689+
"source_path": "docs/build-insights/vcperf-reference.md",
690+
"redirect_url": "/cpp/build-insights/reference/vcperf-commands",
691+
"redirect_document_id": false
692+
},
693+
{
694+
"source_path": "docs/build-insights/wpa-basics.md",
695+
"redirect_url": "/cpp/build-insights/tutorials/wpa-basics",
696+
"redirect_document_id": false
697+
},
698+
{
699+
"source_path": "docs/build-insights/wpa-views-reference.md",
700+
"redirect_url": "/cpp/build-insights/reference/wpa-views",
691701
"redirect_document_id": false
692702
},
693703
{
@@ -745,11 +755,6 @@
745755
"redirect_url": "/cpp/cpp/character-sets",
746756
"redirect_document_id": false
747757
},
748-
{
749-
"source_path": "docs/cpp/index.md",
750-
"redirect_url": "/cpp/cpp/cpp-language-reference",
751-
"redirect_document_id": false
752-
},
753758
{
754759
"source_path": "docs/cpp/using-wmain-instead-of-main.md",
755760
"redirect_url": "/cpp/cpp/main-function-command-line-args",
@@ -7485,11 +7490,6 @@
74857490
"redirect_url": "/cpp/build/how-to-create-a-cpp-project-from-existing-code",
74867491
"redirect_document_id": false
74877492
},
7488-
{
7489-
"source_path": "docs/intrinsics/index.md",
7490-
"redirect_url": "/cpp/intrinsics/compiler-intrinsics",
7491-
"redirect_document_id": false
7492-
},
74937493
{
74947494
"source_path": "docs/mfc/active-documents-on-the-internet.md",
74957495
"redirect_url": "/cpp/mfc/activex-controls",

‎CONTRIBUTING.md‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ In this topic, you'll see the basic process for adding or updating content in th
66

77
In this topic, we'll cover:
88

9-
* [Process for contributing](#process-for-contributing)
10-
* [DOs and DON'Ts](#dos-and-donts)
11-
* [Building the docs](#building-the-docs)
12-
* [Contributing to samples](#contributing-to-samples)
13-
* [Contributor license agreement](#contributor-license-agreement)
9+
- [Process for contributing](#process-for-contributing)
10+
- [DOs and DON'Ts](#dos-and-donts)
11+
- [Building the docs](#building-the-docs)
12+
- [Contributing to samples](#contributing-to-samples)
13+
- [Contributor license agreement](#contributor-license-agreement)
1414

1515
## Process for contributing
1616

@@ -36,11 +36,13 @@ Be sure to follow the proper Markdown syntax. See the [style guide](./styleguide
3636

3737
### Example structure
3838

39-
docs
40-
/standard-library
41-
wstring-convert-class.md
42-
/media
43-
wstring-conversion.png
39+
```
40+
docs
41+
/standard-library
42+
wstring-convert-class.md
43+
/media
44+
wstring-conversion.png
45+
```
4446

4547
**Step 5:** Submit a Pull Request (PR) from your branch to `MicrosoftDocs/cpp-docs/master`.
4648

‎docs/_breadcrumb/toc.yml‎

Lines changed: 114 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -2,116 +2,121 @@
22
tocHref: /
33
topicHref: /
44
items:
5-
- name: Visual 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/overview-of-cpp-development
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-
items:
103-
- name: Compiler and tool errors and warnings
104-
tocHref: /cpp/error-messages/
105-
topicHref: /cpp/error-messages/compiler-errors-1/c-cpp-build-errors
106-
- name: Porting and Upgrading
107-
tocHref: /cpp/porting/
108-
topicHref: /cpp/porting/visual-cpp-porting-and-upgrading-guide
109-
- name: Text and Strings
110-
tocHref: /cpp/text/
111-
topicHref: /cpp/text/text-and-strings-in-visual-cpp
112-
- name: Security
113-
tocHref: /cpp/security
114-
topicHref: /cpp/security/security-best-practices-for-cpp
115-
- name: Cloud and Web
116-
tocHref: /cpp/cloud
117-
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ You can access data members in C++ without regard to access restrictions. Howeve
6666

6767
## See also
6868

69-
[Using C or C++ in __asm Blocks](../../assembler/inline/using-c-or-cpp-in-asm-blocks.md)<br/>
69+
[Using C or C++ in __asm Blocks](../../assembler/inline/using-c-or-cpp-in-asm-blocks.md)<br/>

‎docs/assembler/inline/advantages-of-inline-assembly.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ Inline assembly is a special-purpose tool. If you plan to port an application to
2626

2727
## See also
2828

29-
[Inline Assembler](../../assembler/inline/inline-assembler.md)<br/>
29+
[Inline Assembler](../../assembler/inline/inline-assembler.md)<br/>

‎docs/assembler/inline/asm.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ Unlike braces in C and C++, the braces enclosing an `__asm` block don't affect v
7777
## See also
7878

7979
[Keywords](../../cpp/keywords-cpp.md)<br/>
80-
[Inline Assembler](../../assembler/inline/inline-assembler.md)<br/>
80+
[Inline Assembler](../../assembler/inline/inline-assembler.md)<br/>

‎docs/assembler/inline/assembly-language-comments.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ Because C macros expand into a single logical line, avoid using assembly-languag
2020

2121
## See also
2222

23-
[Using Assembly Language in __asm Blocks](../../assembler/inline/using-assembly-language-in-asm-blocks.md)<br/>
23+
[Using Assembly Language in __asm Blocks](../../assembler/inline/using-assembly-language-in-asm-blocks.md)<br/>

‎docs/assembler/inline/calling-c-functions-in-inline-assembly.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ the example pushes pointers to `world`, `hello`, and `format`, in that order, an
5050

5151
## See also
5252

53-
[Inline Assembler](../../assembler/inline/inline-assembler.md)<br/>
53+
[Inline Assembler](../../assembler/inline/inline-assembler.md)<br/>

‎docs/assembler/inline/calling-cpp-functions-in-inline-assembly.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ You can also call any functions declared with **extern "C"** linkage. This allow
1616

1717
## See also
1818

19-
[Inline Assembler](../../assembler/inline/inline-assembler.md)<br/>
19+
[Inline Assembler](../../assembler/inline/inline-assembler.md)<br/>

0 commit comments

Comments
 (0)