Skip to content

Commit 611693e

Browse files
author
Colin Robertson
authored
Merge pull request MicrosoftDocs#2250 from MicrosoftDocs/master637272354438054531
Fix git push error for protected CLA branch
2 parents ed930b0 + fe146ad commit 611693e

20 files changed

Lines changed: 529 additions & 1730 deletions

‎.openpublishing.redirection.json‎

Lines changed: 4 additions & 9 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
{
@@ -7490,11 +7490,6 @@
74907490
"redirect_url": "/cpp/build/how-to-create-a-cpp-project-from-existing-code",
74917491
"redirect_document_id": false
74927492
},
7493-
{
7494-
"source_path": "docs/intrinsics/index.md",
7495-
"redirect_url": "/cpp/intrinsics/compiler-intrinsics",
7496-
"redirect_document_id": false
7497-
},
74987493
{
74997494
"source_path": "docs/mfc/active-documents-on-the-internet.md",
75007495
"redirect_url": "/cpp/mfc/activex-controls",

‎docs/_breadcrumb/toc.yml‎

Lines changed: 73 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -4,77 +4,69 @@
44
items:
55
- name: Microsoft C++, C, and Assembler
66
tocHref: /cpp/
7-
topicHref: /cpp
7+
topicHref: /cpp/index
88
items:
9-
- name: Microsoft C/C++
10-
tocHref: /cpp/overview/
11-
topicHref: /cpp/overview/visual-cpp-in-visual-studio
12-
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
229
- name: Compiler intrinsics and assembly language
2310
tocHref: /cpp/intrinsics/
24-
topicHref: /cpp/intrinsics/compiler-intrinsics-and-assembly-language
11+
topicHref: /cpp/intrinsics/index
2512
items:
13+
- name: Compiler intrinsics
14+
tocHref: /cpp/intrinsics/
15+
topicHref: /cpp/intrinsics/compiler-intrinsics
2616
- name: ARM and ARM64 assembler
2717
tocHref: /cpp/assembler/arm/
2818
topicHref: /cpp/assembler/arm/arm-assembler-reference
29-
- name: Inline x86 assembler
19+
- name: C/C++ x86 inline assembler
3020
tocHref: /cpp/assembler/inline/
3121
topicHref: /cpp/assembler/inline/inline-assembler
32-
- name: MASM x86 and x64 assembler
22+
- name: x86 and x64 assembler
3323
tocHref: /cpp/assembler/masm/
3424
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: UCRT 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:
4925
- name: ATL
5026
tocHref: /cpp/atl/
5127
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: MFC reference
57-
tocHref: /cpp/mfc/reference/
58-
topicHref: /cpp/mfc/reference/mfc-classes
5928
- name: ATL/MFC shared classes
6029
tocHref: /cpp/atl-mfc-shared/
6130
topicHref: /cpp/atl-mfc-shared/atl-mfc-shared-classes
6231
items:
6332
- name: ATL/MFC reference
6433
tocHref: /cpp/atl-mfc-shared/reference/
6534
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
6664
- name: C++/CX
6765
tocHref: /cpp/cppcx/
6866
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: C++/CLI for .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
67+
- name: Cross-platform mobile development
68+
tocHref: /cpp/cross-platform/
69+
topicHref: /cpp/cross-platform/index
7870
- name: Data access
7971
tocHref: /cpp/data/
8072
topicHref: /cpp/data/data-access-in-cpp
@@ -85,35 +77,46 @@
8577
- name: ODBC
8678
tocHref: /cpp/data/odbc/
8779
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: C++ in the IDE
93-
tocHref: /cpp/ide/
94-
topicHref: /cpp/ide/using-the-visual-studio-ide-for-cpp-desktop-development
95-
- name: Build 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
80+
- name: C++/CLI for .NET
81+
tocHref: /cpp/dotnet/
82+
topicHref: /cpp/dotnet/dotnet-programming-with-cpp-cli-visual-cpp
10583
- name: Errors and warnings
10684
tocHref: /cpp/error-messages/
10785
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
108105
- name: Porting and upgrading
109106
tocHref: /cpp/porting/
110107
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
111117
- name: Text and strings
112118
tocHref: /cpp/text/
113119
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
120+
- name: Windows
121+
tocHref: /cpp/windows/
122+
topicHref: /cpp/windows/overview-of-windows-programming-in-cpp

0 commit comments

Comments
 (0)