Skip to content

Commit cb03648

Browse files
author
mikeblome
committed
merge conflicts
2 parents da1842b + 38a4863 commit cb03648

484 files changed

Lines changed: 13105 additions & 7636 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.

‎.openpublishing.redirection.json‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,11 @@
402402
"redirect_url": "/cpp/build/reference/predefined-rules",
403403
"redirect_document_id": false
404404
},
405+
{
406+
"source_path": "docs/build/profile-guided-optimization-in-the-performance-and-diagnostics-hub.md",
407+
"redirect_url": "/cpp/build/profile-guided-optimizations",
408+
"redirect_document_id": false
409+
},
405410
{
406411
"source_path": "docs/build/pseudotargets.md",
407412
"redirect_url": "/cpp/build/reference/pseudotargets",
@@ -7065,9 +7070,14 @@
70657070
},
70667071
{
70677072
"source_path": "docs/error-messages/tool-errors/index.md",
7068-
"redirect_url": "/cpp/error-messages/tool-errors/bscmake-errors-bk1500-through-bk4505",
7073+
"redirect_url": "/cpp/error-messages/tool-errors/tool-errors-overview",
70697074
"redirect_document_id": false
70707075
},
7076+
{
7077+
"source_path": "docs/error-messages/tool-errors/resource-compiler-errors-rw1004-through-rw4004.md",
7078+
"redirect_url": "/cpp/error-messages/tool-errors/resource-compiler-errors-rc1000-through-rc4413",
7079+
"redirect_document_id": true
7080+
},
70717081
{
70727082
"source_path": "docs/ide/index.md",
70737083
"redirect_url": "/cpp/ide/ide_and_tools_for_visual_cpp_development",

‎docs/_breadcrumb/toc.yml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,9 @@
104104
tocHref: /cpp/build/reference/
105105
topicHref: /cpp/build/reference/c-cpp-building-reference
106106
items:
107-
- name: Compiler Errors
108-
tocHref: /cpp/error-messages/compiler-errors-1/
109-
topicHref: /cpp/compiler-errors-1/c-cpp-build-errors
110-
- name: Compiler Warnings
111-
tocHref: /cpp/compiler-warnings/
112-
topicHref: /cpp/compiler-warnings/compiler-warnings-c4000-through-C4199
113-
- name: Other Tools
114-
tocHref: /cpp/error-messages/tool-errors/
115-
topicHref: /cpp/error-messages/tool-errors/vectorizer-and-parallelizer-messages
107+
- name: Compiler and tool errors and warnings
108+
tocHref: /cpp/error-messages/
109+
topicHref: /cpp/error-messages/compiler-errors-1/c-cpp-build-errors
116110
- name: Porting and Upgrading
117111
tocHref: /cpp/porting/
118112
topicHref: /cpp/porting/visual-cpp-porting-and-upgrading-guide

‎docs/assembler/inline/asm.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ If used without braces, the `__asm` keyword means that the rest of the line is a
3030

3131
Since the `__asm` keyword is a statement separator, you can put assembly instructions on the same line.
3232

33-
Before Visual C++ 2005, the instruction
33+
Before Visual Studio 2005, the instruction
3434

3535
```cpp
3636
__asm int 3

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.assetid: a45b5b22-9b5f-4545-81ec-70eb8ea2ef9b
99

1010
**Microsoft Specific**
1111

12-
The Visual C++ compiler supports all opcodes through the Pentium 4 and AMD Athlon. Additional instructions supported by the target processor can be created with the [_emit Pseudoinstruction](../../assembler/inline/emit-pseudoinstruction.md).
12+
The Microsoft C++ compiler supports all opcodes through the Pentium 4 and AMD Athlon. Additional instructions supported by the target processor can be created with the [_emit Pseudoinstruction](../../assembler/inline/emit-pseudoinstruction.md).
1313

1414
**END Microsoft Specific**
1515

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.assetid: 705deb2d-c3fd-4696-9e22-8bcf25866daf
99

1010
**Microsoft Specific**
1111

12-
The Visual C++ compiler allows you to use Intel's MMX (multimedia extension) instruction set in the inline assembler. The MMX instructions are also supported by the debugger disassembly. The compiler generates a warning message if the function contains MMX instructions but does not contain an EMMS instruction to empty the multimedia state. For more information, see the Intel Web site.
12+
The Microsoft C++ compiler allows you to use Intel's MMX (multimedia extension) instruction set in the inline assembler. The MMX instructions are also supported by the debugger disassembly. The compiler generates a warning message if the function contains MMX instructions but does not contain an EMMS instruction to empty the multimedia state. For more information, see the Intel Web site.
1313

1414
**END Microsoft Specific**
1515

‎docs/assembler/masm/masm-for-x64-ml64-exe.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ ms.assetid: 89059103-f372-4968-80ea-0c7f90bb9c91
66
---
77
# MASM for x64 (ml64.exe)
88

9-
Visual Studio includes both 32-bit and 64-bit hosted versions of Microsoft Assembler (MASM) to target x64 code. Named ml64.exe, this is the assembler that accepts x64 assembler language. The MASM command-line tools are installed when you choose a C++ workload during Visual Studio installation. The MASM tools are not available as a separate download. For instructions on how to download and install a copy of Visual Studio, see [Install Visual Studio](/visualstudio/install/install-visual-studio). If you do not want to install the complete Visual Studio IDE, but only want the command-line tools, download the [Build Tools for Visual Studio 2017](https://go.microsoft.com/fwlink/p/?linkid=875721).
9+
Visual Studio includes both 32-bit and 64-bit hosted versions of Microsoft Assembler (MASM) to target x64 code. Named ml64.exe, this is the assembler that accepts x64 assembler language. The MASM command-line tools are installed when you choose a C++ workload during Visual Studio installation. The MASM tools are not available as a separate download. For instructions on how to download and install a copy of Visual Studio, see [Install Visual Studio](/visualstudio/install/install-visual-studio). If you do not want to install the complete Visual Studio IDE, but only want the command-line tools, download the [Build Tools for Visual Studio](https://visualstudio.microsoft.com/downloads/).
1010

1111
To use MASM to build code for x64 targets on the command line, you must use a developer command prompt for x64 targets, which sets the required path and other environment variables. For information on how to start a developer command prompt, see [Build C/C++ code on the command line](../../build/building-on-the-command-line.md).
1212

1313
For information on ml64.exe command line options, see [ML and ML64 Command-Line Reference](../../assembler/masm/ml-and-ml64-command-line-reference.md).
1414

15-
Inline assembler or use of the ASM keyword is not supported for x64 or ARM targets. To port your x86 code that uses inline assembler to x64 or ARM, you can convert your code to C++, use compiler intrinsics, or create assembler-language source files. The Visual C++ compiler supports intrinsics to allow you to use special-function instructions, for example, privileged, bit scan/test, interlocked, and so on, in as close to a cross-platform manner as possible. For information on available intrinsics, see [Compiler Intrinsics](../../intrinsics/compiler-intrinsics.md).
15+
Inline assembler or use of the ASM keyword is not supported for x64 or ARM targets. To port your x86 code that uses inline assembler to x64 or ARM, you can convert your code to C++, use compiler intrinsics, or create assembler-language source files. The Microsoft C++ compiler supports intrinsics to allow you to use special-function instructions, for example, privileged, bit scan/test, interlocked, and so on, in as close to a cross-platform manner as possible. For information on available intrinsics, see [Compiler Intrinsics](../../intrinsics/compiler-intrinsics.md).
1616

17-
## Add an assembler-language file to a Visual C++ project
17+
## Add an assembler-language file to a Visual Studio C++ project
1818

1919
The Visual Studio project system supports assembler-language files built by using MASM in your C++ projects. You can create x64 assembler-language source files and build them into object files by using MASM, which supports x64 fully. You can then link these object files to your C++ code built for x64 targets. This is one way to overcome the lack of an x64 inline assembler.
2020

21-
### To add an assembler-language file to an existing Visual C++ project
21+
### To add an assembler-language file to an existing Visual Studio C++ project
2222

2323
1. Select the project in **Solution Explorer**. On the menu bar, choose **Project**, **Build Customizations**.
2424

‎docs/atl/active-template-library-atl-concepts.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
22
title: "Active Template Library (ATL) Concepts"
3-
ms.date: "11/04/2016"
3+
ms.date: "05/06/2019"
44
helpviewer_keywords: ["ATL, about ATL"]
55
ms.assetid: a3960991-4d76-4da5-9568-3fa7fde53ff4
66
---
77
# Active Template Library (ATL) Concepts
88

99
The Active Template Library (ATL) is a set of template-based C++ classes that let you create small, fast Component Object Model (COM) objects. It has special support for key COM features, including stock implementations, dual interfaces, standard COM enumerator interfaces, connection points, tear-off interfaces, and ActiveX controls.
1010

11-
If you do a lot of ATL programming, you will want to learn more about attributes, a new feature in Visual C++ .NET that is designed to simplify COM programming. For more information, see [Attributed Programming](../windows/attributed-programming-concepts.md).
11+
If you do a lot of ATL programming, you will want to learn more about COM and .NET attributes, which is designed to simplify COM programming. For more information, see [Attributed Programming](../windows/attributed-programming-concepts.md). (COM and .NET attributes are not to be confused with the \[\[attribute]] feature in the C++ standard.)
1212

1313
## In This Section
1414

‎docs/atl/active-template-library-atl-tutorial.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
title: "Active Template Library (ATL) Tutorial"
3+
description: "Create an ActiveX control using Microsoft C++ and the Active Template Library."
34
ms.custom: "get-started-article"
4-
ms.date: "11/04/2016"
5+
ms.date: "05/03/2019"
56
helpviewer_keywords: ["ATL projects, tutorials", "controls [ATL], tutorials", "ATL tutorial", "tutorials [ATL]", "ATL, tutorials"]
67
ms.assetid: f921a121-09c8-4812-9317-e15b2f1471fa
78
---

‎docs/atl/adding-a-property-page-atl-tutorial-part-6.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ ms.assetid: df80d255-e7ea-49d9-b940-3f012e90cf9b
66
---
77
# Adding a Property Page (ATL Tutorial, Part 6)
88

9+
> [!NOTE]
10+
> The ATL OLE DB Provider wizard is not available in Visual Studio 2019 and later.
11+
912
Property pages are implemented as separate COM objects, which allow them to be shared if required. In this step, you will do the following tasks to add a property page to the control:
1013

1114
- Creating the Property Page Resource

‎docs/atl/benefits-and-tradeoffs-of-the-method-used-to-link-to-the-crt.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Benefits and Tradeoffs of the Method Used to Link to the CRT"
3-
ms.date: "11/04/2016"
3+
ms.date: "05/06/2019"
44
helpviewer_keywords: ["_ATL_MIN_CRT macro"]
55
ms.assetid: 49b485f7-9487-49e4-b12a-0f710b620e2b
66
---

0 commit comments

Comments
 (0)