Skip to content

Commit 31a7a65

Browse files
author
Michael Blome
committed
fixed up merge comflicts
2 parents 922d498 + 0176347 commit 31a7a65

15,109 files changed

Lines changed: 1136439 additions & 1150824 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.

‎docs/TOC.md‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
1-
# [Visual C++ in Visual Studio 2017 RC](top/visual-cpp-in-visual-studio.md)
2-
# [What's New for Visual C++ in Visual Studio 2017 RC](top/what-s-new-for-visual-cpp-in-visual-studio.md)
3-
# [Supported Platforms (Visual C++)](top/supported-platforms-visual-cpp.md)
4-
# [C Language](c-language/c-language-reference.md)
5-
# [C++ Language](cpp/cpp-language-reference.md)
6-
# [C/C++ Preprocessor](preprocessor/c-cpp-preprocessor-reference.md)
7-
# [C Runtime Library](c-runtime-library/c-run-time-library-reference.md)
8-
# [C++ Standard Library](standard-library/cpp-standard-library-reference.md)
9-
# [Windows Development](windows/overview-of-windows-programming-in-cpp.md)
10-
# [Linux Development](linux/download-install-and-setup-the-linux-development-workload.md)
11-
# [.NET Development with C++/CLI](dotnet/dotnet-programming-with-cpp-cli-visual-cpp.md)
12-
# [Cloud and Web Programming in Visual C++](top/cloud-and-web-programming-in-visual-cpp.md)
13-
## [C++ REST SDK (Codename "Casablanca")](top/cpp-rest-sdk-codename-casablanca.md)
14-
# [Parallel Programming](parallel/dotnet-programming-with-cpp-cli-visual-cpp.md)
15-
# [Data Access](data/data-access-programming-mfc-atl.md)
16-
# [Text and Strings](text/text-and-strings-in-visual-cpp.md)
17-
# [Using the Visual Studio IDE for C++](ide/ide-and-tools-for-visual-cpp-development.md)
18-
# [Compilers and Build Tools](build/building-c-cpp-programs.md)
19-
# [Porting and Upgrading Visual C++ Code](porting/visual-cpp-porting-and-upgrading-guide.md)
20-
# [Security Best Practices for C++](top/security-best-practices-for-cpp.md)
21-
## [Running as a Member of the Users Group](top/running-as-a-member-of-the-users-group.md)
22-
## [How User Account Control (UAC) Affects Your Application](top/how-user-account-control-uac-affects-your-application.md)
23-
# [Visual C++ Samples](top/visual-cpp-samples.md)
24-
# [Visual C++ Help and Community](top/visual-cpp-help-and-community.md)
25-
# [How to Report a Problem with the Visual C++ Toolset](top/how-to-report-a-problem-with-the-visual-cpp-toolset.md)
26-
1+
# [Visual C++ in Visual Studio 2017 RC](top/visual-cpp-in-visual-studio.md)
2+
# [What's New for Visual C++ in Visual Studio 2017 RC](top/what-s-new-for-visual-cpp-in-visual-studio.md)
3+
# [Supported Platforms (Visual C++)](top/supported-platforms-visual-cpp.md)
4+
# [C Language](c-language/c-language-reference.md)
5+
# [C++ Language](cpp/cpp-language-reference.md)
6+
# [C/C++ Preprocessor](preprocessor/c-cpp-preprocessor-reference.md)
7+
# [C Runtime Library](c-runtime-library/c-run-time-library-reference.md)
8+
# [C++ Standard Library](standard-library/cpp-standard-library-reference.md)
9+
# [Windows Development](windows/overview-of-windows-programming-in-cpp.md)
10+
# [Linux Development](linux/download-install-and-setup-the-linux-development-workload.md)
11+
# [.NET Development with C++/CLI](dotnet/dotnet-programming-with-cpp-cli-visual-cpp.md)
12+
# [Cloud and Web Programming in Visual C++](top/cloud-and-web-programming-in-visual-cpp.md)
13+
## [C++ REST SDK (Codename "Casablanca")](top/cpp-rest-sdk-codename-casablanca.md)
14+
# [Parallel Programming](parallel/dotnet-programming-with-cpp-cli-visual-cpp.md)
15+
# [Data Access](data/data-access-programming-mfc-atl.md)
16+
# [Text and Strings](text/text-and-strings-in-visual-cpp.md)
17+
# [Using the Visual Studio IDE for C++](ide/ide-and-tools-for-visual-cpp-development.md)
18+
# [Compilers and Build Tools](build/building-c-cpp-programs.md)
19+
# [Porting and Upgrading Visual C++ Code](porting/visual-cpp-porting-and-upgrading-guide.md)
20+
# [Security Best Practices for C++](top/security-best-practices-for-cpp.md)
21+
## [Running as a Member of the Users Group](top/running-as-a-member-of-the-users-group.md)
22+
## [How User Account Control (UAC) Affects Your Application](top/how-user-account-control-uac-affects-your-application.md)
23+
# [Visual C++ Samples](top/visual-cpp-samples.md)
24+
# [Visual C++ Help and Community](top/visual-cpp-help-and-community.md)
25+
# [How to Report a Problem with the Visual C++ Toolset](top/how-to-report-a-problem-with-the-visual-cpp-toolset.md)

‎docs/_breadcrumb/toc.yml‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
- name: Docs
2+
tocHref: /
3+
topicHref: /
4+
items:
5+
- name: Visual C++
6+
tocHref: /cpp/
7+
topicHref: /cpp/top/visual-cpp-in-visual-studio
8+
items:
9+
- name: C++ Language
10+
tocHref: /cpp/cpp/
11+
topicHref: /cpp/cpp/cpp-language-reference
12+
- name: C Language
13+
tocHref: /cpp/c-language/
14+
topicHref: /cpp/c-language/c-language-reference
15+
- name: C/C++ Preprocessor
16+
tocHref: /cpp/preprocessor/
17+
topicHref: /cpp/c-cpp-preprocessor-reference
18+
- name: C Runtime Library
19+
tocHref: /cpp/c-runtime-library/
20+
topicHref: /cpp/c-runtime-library/c-runtime-library-reference
21+
items:
22+
- name: Reference
23+
tocHref: /cpp/c-runtime-library/reference/
24+
topicHref: /cpp/c-runtime-library/reference/alphabetical-function-reference
25+
- name: C++ Standard Library
26+
tocHref: /cpp/standard-library/
27+
topicHref: /cpp/standard-library/cpp-standard-library
28+
- name: Windows
29+
tocHref: /cpp/windows/
30+
topicHref: /cpp/windows/overview-of-windows-programming-in-cpp
31+
items:
32+
- name: ATL
33+
tocHref: /cpp/atl/
34+
topicHref: /cpp/atl/atl-com-desktop-components
35+
items:
36+
- name: Reference
37+
tocHref: /cpp/atl/reference/
38+
topicHref: /cpp/atl/reference/atl-classes
39+
- name: MFC
40+
tocHref: /cpp/mfc/
41+
topicHref: /cpp/mfc/mfc-desktop-applications
42+
items:
43+
- name: Reference
44+
tocHref: /cpp/mfc/reference/
45+
topicHref: /cpp/mfc/reference/mfc-classes
46+
- name: ATL/MFC Shared Classes
47+
tocHref: /cpp/atl-mfc-shared/
48+
topicHref: /cpp/atl-mfc-shared/atl-mfc-shared-classes
49+
items:
50+
- name: Reference
51+
tocHref: /cpp/atl-mfc-shared/reference/
52+
topicHref: /cpp/atl-mfc/shared/reference/classes-shared-by-atl-and-mfc
53+
- name: .NET
54+
tocHref: /cpp/dotnet/
55+
topicHref: /cpp/dotnet/dotnet-programming-with-cpp-cli
56+
- name: Parallel Programming
57+
tocHref: /cpp/parallel/
58+
topicHref: /cpp/parallel/parallel-programming-in-visual-cpp
59+
- name: Data Access
60+
tocHref: /cpp/data/
61+
topicHref: /cpp/data/data-access
62+
items:
63+
- name: OLEDB
64+
tocHref: /cpp/data/oledb/
65+
topicHref: /cpp/data/oledb/ole-db-programming
66+
- name: ODBC
67+
tocHref: /cpp/data/odbc/
68+
topicHref: /cpp/data/odbc/open-database-connectivity-odbc
69+
- name: ADO and RDO
70+
tocHref: /cpp/data/ado-rdo/
71+
topicHref: /cpp/data/ado-rdo/data-bound-controls-ado-and-rdo
72+
- name: IDE and Tools
73+
tocHref: /cpp/ide/
74+
topicHref: /cpp/ide/ide-and-tools-for-visual-cpp-development
75+
items:
76+
- name: IDE
77+
tocHref: /cpp/ide/
78+
topicHref: /cpp/ide/using-the-visual-studio-ide-for-cpp-desktop-development
79+
- name: Building
80+
tocHref: /cpp/build/
81+
tocHref: /cpp/build/building-c-cpp-programs
82+
- name: Compiler Intrinsics and Assembly Language
83+
tocHref: /cpp/intrinsics/
84+
topicHref: /cpp/intrinsics/c-cpp-intrinsics
85+
items:
86+
- name: ARM
87+
tocHref: /cpp/assembler/arm/
88+
topicHref: /cpp/assembler/arm/arm-assembler-reference
89+
- name: Inline assembler
90+
tocHref: /cpp/assembler/inline/
91+
topicHref: /cpp/assembler/inline-assembler-reference
92+
- name: MASM
93+
tocHref: /cpp/assembler/masm/
94+
topicHref: /cpp/assembler/masm/microsoft-macro-assembler-reference
95+
- name: Build Reference
96+
tocHref: /cpp/build/reference/
97+
topicHref: /cpp/build/reference/c-cpp-building-reference
98+
items:
99+
- name: Compiler Errors
100+
tocHref: /cpp/error-messages/compiler-errors-1/
101+
topicHref: /cpp/compiler-errors-1/c-cpp-build-errors
102+
- name: Compiler Warnings
103+
tocHref: /cpp/compiler-warnings/
104+
topicHref: /cpp/compiler-warnings/compiler-warnings-c4000-through-C4199
105+
- name: Other Tools
106+
tocHref: /cpp/error-messages/tool-errors/
107+
topicHref: /cpp/error-messages/tool-errors/vectorizer-and-parallelizer-messages
108+
- name: Porting and Upgrading
109+
tocHref: /cpp/porting/
110+
topicHref: /cpp/porting/porting-and-upgrading-guide
111+
- name: Text and Strings
112+
tocHref: /cpp/text/
113+
topicHref: /cpp/text/text-and-strings

‎docs/assembler/arm/TOC.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [ARM Assembler Reference](arm-assembler-reference.md)
2-
## [ARM Assembler Command-Line Reference](arm-assembler-command-line-reference.md)
3-
## [ARM Assembler Diagnostic Messages](arm-assembler-diagnostic-messages.md)
4-
## [ARM Assembler Directives](arm-assembler-directives.md)
1+
# [ARM Assembler Reference](arm-assembler-reference.md)
2+
## [ARM Assembler Command-Line Reference](arm-assembler-command-line-reference.md)
3+
## [ARM Assembler Diagnostic Messages](arm-assembler-diagnostic-messages.md)
4+
## [ARM Assembler Directives](arm-assembler-directives.md)

‎docs/assembler/arm/arm-assembler-command-line-reference.md‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
1-
---
2-
title: "ARM Assembler Command-Line Reference | Microsoft Docs"
3-
ms.custom: ""
4-
ms.date: "11/04/2016"
5-
ms.prod: "visual-studio-dev14"
6-
ms.reviewer: ""
7-
ms.suite: ""
8-
ms.technology:
9-
- "devlang-cpp"
10-
ms.tgt_pltfrm: ""
11-
ms.topic: "article"
12-
dev_langs:
13-
- "C++"
14-
ms.assetid: f7b89478-1ab5-4995-8cde-a805f0462c45
15-
caps.latest.revision: 12
16-
author: "corob-msft"
17-
ms.author: "corob"
18-
manager: "ghogen"
19-
translation.priority.ht:
20-
- "cs-cz"
21-
- "de-de"
22-
- "es-es"
23-
- "fr-fr"
24-
- "it-it"
25-
- "ja-jp"
26-
- "ko-kr"
27-
- "pl-pl"
28-
- "pt-br"
29-
- "ru-ru"
30-
- "tr-tr"
31-
- "zh-cn"
32-
- "zh-tw"
33-
---
34-
# ARM Assembler Command-Line Reference
1+
---
2+
title: "ARM Assembler Command-Line Reference | Microsoft Docs"
3+
ms.custom: ""
4+
ms.date: "11/04/2016"
5+
ms.reviewer: ""
6+
ms.suite: ""
7+
ms.technology:
8+
- "devlang-cpp"
9+
ms.tgt_pltfrm: ""
10+
ms.topic: "article"
11+
dev_langs:
12+
- "C++"
13+
ms.assetid: f7b89478-1ab5-4995-8cde-a805f0462c45
14+
caps.latest.revision: 12
15+
author: "corob-msft"
16+
ms.author: "corob"
17+
manager: "ghogen"
18+
translation.priority.ht:
19+
- "cs-cz"
20+
- "de-de"
21+
- "es-es"
22+
- "fr-fr"
23+
- "it-it"
24+
- "ja-jp"
25+
- "ko-kr"
26+
- "pl-pl"
27+
- "pt-br"
28+
- "ru-ru"
29+
- "tr-tr"
30+
- "zh-cn"
31+
- "zh-tw"
32+
---
33+
# ARM Assembler Command-Line Reference
3534
This article provides command-line information about the Microsoft ARM assembler, *armasm*, which compiles ARMv7 Thumb assembly language into the Microsoft implementation of the Common Object File Format (COFF). The linker can link COFF code with object code that is produced by the ARM assembler or by the C compiler, together with object libraries that are created by the librarian.
3635

3736
## Syntax

‎docs/assembler/arm/arm-assembler-diagnostic-messages.md‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
1-
---
2-
title: "ARM Assembler Diagnostic Messages | Microsoft Docs"
3-
ms.custom: ""
4-
ms.date: "11/04/2016"
5-
ms.prod: "visual-studio-dev14"
6-
ms.reviewer: ""
7-
ms.suite: ""
8-
ms.technology:
9-
- "devlang-cpp"
10-
ms.tgt_pltfrm: ""
11-
ms.topic: "article"
12-
dev_langs:
13-
- "C++"
14-
ms.assetid: 52b38267-6023-4bdc-a0ef-863362f48eec
15-
caps.latest.revision: 6
16-
author: "corob-msft"
17-
ms.author: "corob"
18-
manager: "ghogen"
19-
translation.priority.ht:
20-
- "cs-cz"
21-
- "de-de"
22-
- "es-es"
23-
- "fr-fr"
24-
- "it-it"
25-
- "ja-jp"
26-
- "ko-kr"
27-
- "pl-pl"
28-
- "pt-br"
29-
- "ru-ru"
30-
- "tr-tr"
31-
- "zh-cn"
32-
- "zh-tw"
33-
---
34-
# ARM Assembler Diagnostic Messages
1+
---
2+
title: "ARM Assembler Diagnostic Messages | Microsoft Docs"
3+
ms.custom: ""
4+
ms.date: "11/04/2016"
5+
ms.reviewer: ""
6+
ms.suite: ""
7+
ms.technology:
8+
- "devlang-cpp"
9+
ms.tgt_pltfrm: ""
10+
ms.topic: "article"
11+
dev_langs:
12+
- "C++"
13+
ms.assetid: 52b38267-6023-4bdc-a0ef-863362f48eec
14+
caps.latest.revision: 6
15+
author: "corob-msft"
16+
ms.author: "corob"
17+
manager: "ghogen"
18+
translation.priority.ht:
19+
- "cs-cz"
20+
- "de-de"
21+
- "es-es"
22+
- "fr-fr"
23+
- "it-it"
24+
- "ja-jp"
25+
- "ko-kr"
26+
- "pl-pl"
27+
- "pt-br"
28+
- "ru-ru"
29+
- "tr-tr"
30+
- "zh-cn"
31+
- "zh-tw"
32+
---
33+
# ARM Assembler Diagnostic Messages
3534
The Microsoft ARM assembler (*armasm*) emits diagnostic warnings and errors when it encounters them. This article describes the most commonly-encountered messages.
3635

3736
## Syntax

‎docs/assembler/arm/arm-assembler-directives.md‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
1-
---
2-
title: "ARM Assembler Directives | Microsoft Docs"
3-
ms.custom: ""
4-
ms.date: "11/04/2016"
5-
ms.prod: "visual-studio-dev14"
6-
ms.reviewer: ""
7-
ms.suite: ""
8-
ms.technology:
9-
- "devlang-cpp"
10-
ms.tgt_pltfrm: ""
11-
ms.topic: "article"
12-
dev_langs:
13-
- "C++"
14-
ms.assetid: 9cfa8896-ec10-4e77-855a-3135c40d7d2a
15-
caps.latest.revision: 5
16-
author: "corob-msft"
17-
ms.author: "corob"
18-
manager: "ghogen"
19-
translation.priority.ht:
20-
- "cs-cz"
21-
- "de-de"
22-
- "es-es"
23-
- "fr-fr"
24-
- "it-it"
25-
- "ja-jp"
26-
- "ko-kr"
27-
- "pl-pl"
28-
- "pt-br"
29-
- "ru-ru"
30-
- "tr-tr"
31-
- "zh-cn"
32-
- "zh-tw"
33-
---
34-
# ARM Assembler Directives
1+
---
2+
title: "ARM Assembler Directives | Microsoft Docs"
3+
ms.custom: ""
4+
ms.date: "11/04/2016"
5+
ms.reviewer: ""
6+
ms.suite: ""
7+
ms.technology:
8+
- "devlang-cpp"
9+
ms.tgt_pltfrm: ""
10+
ms.topic: "article"
11+
dev_langs:
12+
- "C++"
13+
ms.assetid: 9cfa8896-ec10-4e77-855a-3135c40d7d2a
14+
caps.latest.revision: 5
15+
author: "corob-msft"
16+
ms.author: "corob"
17+
manager: "ghogen"
18+
translation.priority.ht:
19+
- "cs-cz"
20+
- "de-de"
21+
- "es-es"
22+
- "fr-fr"
23+
- "it-it"
24+
- "ja-jp"
25+
- "ko-kr"
26+
- "pl-pl"
27+
- "pt-br"
28+
- "ru-ru"
29+
- "tr-tr"
30+
- "zh-cn"
31+
- "zh-tw"
32+
---
33+
# ARM Assembler Directives
3534
For the most part, the Microsoft ARM assembler uses the ARM assembly language, which is documented in Chapter 7 of the [ARM assembler tools guide](http://go.microsoft.com/fwlink/?LinkId=246102). However, the Microsoft implementations of some assembly directives differ from the ARM assembly directives. This article explains the differences.
3635

3736
## Microsoft Implementations of ARM Assembly Directives

0 commit comments

Comments
 (0)