Skip to content

Commit 174e85e

Browse files
author
mikeblome
committed
local merge conflicts
2 parents c09e986 + 2bf6253 commit 174e85e

File tree

10,780 files changed

+25328
-23519
lines changed

Some content is hidden

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

10,780 files changed

+25328
-23519
lines changed

‎docs/_breadcrumb/toc.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,7 @@
8686
- name: Building
8787
tocHref: /cpp/build/
8888
tocHref: /cpp/build/building-c-cpp-programs
89-
- name: Compiler Intrinsics and Assembly Language
90-
tocHref: /cpp/intrinsics/
91-
topicHref: /cpp/intrinsics/compiler-intrinsics-and-assembly-language
9289
items:
93-
- name: ARM
94-
tocHref: /cpp/assembler/arm/
95-
topicHref: /cpp/assembler/arm/arm-assembler-reference
96-
- name: Inline assembler
97-
tocHref: /cpp/assembler/inline/
98-
topicHref: /cpp/assembler/inline-assembler-reference
99-
- name: MASM
100-
tocHref: /cpp/assembler/masm/
101-
topicHref: /cpp/assembler/masm/microsoft-macro-assembler-reference
10290
- name: Build Reference
10391
tocHref: /cpp/build/reference/
10492
topicHref: /cpp/build/reference/c-cpp-building-reference
@@ -112,6 +100,19 @@
112100
- name: Other Tools
113101
tocHref: /cpp/error-messages/tool-errors/
114102
topicHref: /cpp/error-messages/tool-errors/vectorizer-and-parallelizer-messages
103+
- name: Compiler Intrinsics and Assembly Language
104+
tocHref: /cpp/intrinsics/
105+
topicHref: /cpp/intrinsics/compiler-intrinsics-and-assembly-language
106+
items:
107+
- name: ARM
108+
tocHref: /cpp/assembler/arm/
109+
topicHref: /cpp/assembler/arm/arm-assembler-reference
110+
- name: Inline assembler
111+
tocHref: /cpp/assembler/inline/
112+
topicHref: /cpp/assembler/inline-assembler-reference
113+
- name: MASM
114+
tocHref: /cpp/assembler/masm/
115+
topicHref: /cpp/assembler/masm/microsoft-macro-assembler-reference
115116
- name: Porting and Upgrading
116117
tocHref: /cpp/porting/
117118
topicHref: /cpp/porting/visual-cpp-porting-and-upgrading-guide

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎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
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/asm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
f1_keywords:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/data-directives-and-operators-in-inline-assembly.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/debugging-and-listings-for-inline-assembly.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/defining-asm-blocks-as-c-macros.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/emit-pseudoinstruction.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
f1_keywords:

‎docs/assembler/inline/even-and-align-directives.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
f1_keywords:

‎docs/assembler/inline/inline-assembler-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/inline-assembler.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/instruction-set-for-inline-assembly.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/intel-s-mmx-instruction-set.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/jumping-to-labels-in-inline-assembly.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/masm-expressions-in-inline-assembly.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/masm-macro-directives-in-inline-assembly.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/optimizing-inline-assembly.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/segment-references-in-inline-assembly.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/type-and-variable-sizes-in-inline-assembly.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
f1_keywords:

‎docs/assembler/inline/using-and-preserving-registers-in-inline-assembly.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/using-assembly-language-in-asm-blocks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/using-c-or-cpp-symbols-in-asm-blocks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/using-operators-in-asm-blocks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/inline/writing-functions-with-inline-assembly.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
dev_langs:

‎docs/assembler/masm/alias-masm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "devlang-cpp"
7+
ms.technology:
8+
- "cpp-tools"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
f1_keywords:

0 commit comments

Comments
 (0)