Skip to content

Commit ebabbe8

Browse files
author
mikeblome
committed
fixed merge conflicts
2 parents 4f7e301 + 12e6f23 commit ebabbe8

287 files changed

Lines changed: 2586 additions & 1884 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: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,31 @@
690690
"redirect_url": "/cpp/cloud/cloud-and-web-programming-in-visual-cpp",
691691
"redirect_document_id": false
692692
},
693+
{
694+
"source_path": "docs/cpp/using-arrays-cpp.md",
695+
"redirect_url": "/cpp/cpp/arrays-cpp",
696+
"redirect_document_id": false
697+
},
698+
{
699+
"source_path": "docs/cpp/initializing-arrays.md",
700+
"redirect_url": "/cpp/cpp/arrays-cpp",
701+
"redirect_document_id": false
702+
},
703+
{
704+
"source_path": "docs/cpp/interpretation-of-subscript-operator.md",
705+
"redirect_url": "/cpp/cpp/arrays-cpp",
706+
"redirect_document_id": false
707+
},
708+
{
709+
"source_path": "docs/cpp/indirection-on-array-types.md",
710+
"redirect_url": "/cpp/cpp/arrays-cpp",
711+
"redirect_document_id": false
712+
},
713+
{
714+
"source_path": "docs/cpp/ordering-of-cpp-arrays.md",
715+
"redirect_url": "/cpp/cpp/arrays-cpp",
716+
"redirect_document_id": false
717+
},
693718
{
694719
"source_path": "docs/cpp/attributes2.md",
695720
"redirect_url": "/cpp/cpp/attributes",
@@ -720,11 +745,21 @@
720745
"redirect_url": "/cpp/cpp/welcome-back-to-cpp-modern-cpp",
721746
"redirect_document_id": false
722747
},
748+
{
749+
"source_path": "docs/cpp/cpp-exception-handling.md",
750+
"redirect_url": "/cpp/cpp/exception-handling-in-visual-cpp",
751+
"redirect_document_id": false
752+
},
723753
{
724754
"source_path": "docs/cpp/types-of-linkage.md",
725755
"redirect_url": "/cpp/cpp/program-and-linkage-cpp",
726756
"redirect_document_id": false
727757
},
758+
{
759+
"source_path": "docs/cpp/uniform-initialization-and-delegating-constructors.md",
760+
"redirect_url": "/cpp/cpp/initializing-classes-and-structs-without-constructors-cpp",
761+
"redirect_document_id": false
762+
},
728763
{
729764
"source_path": "docs/cpp/linkage-in-names-with-file-scope.md",
730765
"redirect_url": "/cpp/cpp/program-and-linkage-cpp",
@@ -852,17 +887,17 @@
852887
},
853888
{
854889
"source_path": "docs/c-runtime-library/reference/cos-cosf-cosl-cosh-coshf-coshl.md",
855-
"redirect_url": "/cpp/c-runtime-library/reference/cos-cosf-cosl.md",
890+
"redirect_url": "/cpp/c-runtime-library/reference/cos-cosf-cosl",
856891
"redirect_document_id": false
857892
},
858893
{
859894
"source_path": "docs/c-runtime-library/reference/sin-sinf-sinl-sinh-sinhf-sinhl.md",
860-
"redirect_url": "/cpp/c-runtime-library/reference/sin-sinf-sinl.md",
895+
"redirect_url": "/cpp/c-runtime-library/reference/sin-sinf-sinl",
861896
"redirect_document_id": false
862897
},
863898
{
864899
"source_path": "docs/c-runtime-library/reference/tan-tanf-tanl-tanh-tanhf-tanhl.md",
865-
"redirect_url": "/cpp/c-runtime-library/reference/tan-tanf-tanl.md",
900+
"redirect_url": "/cpp/c-runtime-library/reference/tan-tanf-tanl",
866901
"redirect_document_id": false
867902
},
868903
{
@@ -942,7 +977,7 @@
942977
},
943978
{
944979
"source_path": "docs/ide/cmakesettings-reference.md",
945-
"redirect_url": "/cpp/build/cmakesettings-reference.md",
980+
"redirect_url": "/cpp/build/cmakesettings-reference",
946981
"redirect_document_id": true
947982
},
948983
{

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ The articles in this section of the documentation provide reference material for
1919

2020
## See also
2121

22-
[ARM Intrinsics](../../intrinsics/arm-intrinsics.md)<br/>
23-
[Compiler Intrinsics](../../intrinsics/compiler-intrinsics.md)<br/>
22+
[ARM intrinsics](../../intrinsics/arm-intrinsics.md)\
23+
[ARM64 intrinsics](../../intrinsics/arm64-intrinsics.md)\
24+
[Compiler intrinsics](../../intrinsics/compiler-intrinsics.md)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ 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](https://visualstudio.microsoft.com/downloads/).
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/#build-tools-for-visual-studio-2019).
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

‎docs/build/arm64-windows-abi-conventions.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ Finally, when referring to data types, the following definitions from ARM are re
3131

3232
The ARM64 version of Windows presupposes that it's running on an ARMv8 or later architecture at all times. Both floating-point and NEON support are presumed to be present in hardware.
3333

34-
The ARMv8 specification allows for full support of AArch32 applications. However, support for existing ARM32 applications on the ARM64 version of Windows isn't planned. (That is, there are no plans for WOW64). This support is subject to re-evaluation in the future, but it's the current working assumption.
35-
3634
The ARMv8 specification describes new optional crypto and CRC helper opcodes for both AArch32 and AArch64. Support for them is currently optional, but recommended. To take advantage of these opcodes, apps should first make runtime checks for their existence.
3735

3836
## Endianness

‎docs/build/building-on-the-command-line.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
title: "Use the Microsoft C++ toolset from the command line"
33
description: "Use the Microsoft C++ compiler toolchain (MSVC) from the command line outside of the Visual Studio IDE."
44
ms.custom: "conceptual"
5-
ms.date: "10/22/2019"
5+
ms.date: "11/12/2019"
66
helpviewer_keywords: ["command-line builds [C++]", "compiling source code [C++], command line", "builds [C++], command-line", "command line [C++], building from", "command line [C++], compilers"]
77
ms.assetid: 7ca9daed-a003-4162-842d-908f79058365
88
---
99
# Use the Microsoft C++ toolset from the command line
1010

11-
You can build C and C++ applications on the command line by using tools that are included in Visual Studio. The Microsoft C++ (MSVC) compiler toolset is also downloadable as a standalone package from the [Visual Studio downloads](https://visualstudio.microsoft.com/downloads/) page. It's part of the **Build Tools for Visual Studio** package. You can choose to download only the tools you need for C++ development.
11+
You can build C and C++ applications on the command line by using tools that are included in Visual Studio. The Microsoft C++ (MSVC) compiler toolset is also downloadable as a standalone package that doesn't include the Visual Studio IDE.
12+
13+
## Download and install the tools
14+
15+
If you've installed Visual Studio and a C++ workload, you have all the command-line tools. For information on how to install C++ and Visual Studio, see [Install C++ support in Visual Studio](vscpp-step-0-installation.md). If you only want the command-line toolset, download the [Build Tools for Visual Studio](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2019). When you run the downloaded executable, it updates and runs the Visual Studio Installer. To install only the tools you need for C++ development, select the **C++ build tools** workload. You can select optional libraries and toolsets to include under **Installation details**. To build code by using the Visual Studio 2015 or 2017 toolsets, select the optional MSVC v140 or MSVC v141 build tools. When you're satisfied with your selections, choose **Install**.
1216

1317
## How to use the command-line tools
1418

‎docs/build/configuring-programs-for-arm-processors-visual-cpp.md‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,25 @@ This section of the documentation contains information about how to use the MSVC
99

1010
## In This Section
1111

12-
[Overview of ARM ABI Conventions](overview-of-arm-abi-conventions.md)<br/>
12+
[Overview of ARM ABI conventions](overview-of-arm-abi-conventions.md)\
1313
Describes the application binary interface used by Windows on ARM for register usage, calling conventions and exception handling.
1414

15-
[Overview of ARM64 ABI Conventions](arm64-windows-abi-conventions.md)<br/>
15+
[Overview of ARM64 ABI conventions](arm64-windows-abi-conventions.md)\
1616
Describes the application binary interface used by Windows on ARM64 for register usage, calling conventions and exception handling.
1717

18-
[Common MSVC ARM Migration Issues](common-visual-cpp-arm-migration-issues.md)<br/>
18+
[Common MSVC ARM migration issues](common-visual-cpp-arm-migration-issues.md)\
1919
Describes C++ code elements that are commonly assumed to be portable across architectures, but which produce different results for ARM than for x86 and x64.
2020

21-
[ARM Exception Handling](arm-exception-handling.md)<br/>
21+
[ARM exception handling](arm-exception-handling.md)\
2222
Describes the encoding scheme for stack unwinding during structured exception handling in Windows on ARM.
2323

24-
[ARM64 Exception Handling](arm64-exception-handling.md)<br/>
24+
[ARM64 exception handling](arm64-exception-handling.md)\
2525
Describes the encoding scheme for stack unwinding during structured exception handling in Windows on ARM64.
2626

2727
## Related Sections
2828

29-
[ARM Intrinsics](../intrinsics/arm-intrinsics.md)<br/>
29+
[ARM intrinsics](../intrinsics/arm-intrinsics.md)\
3030
Describes compiler intrinsics for processors that use the ARM architecture.
31+
32+
[ARM64 intrinsics](../intrinsics/arm-intrinsics.md)\
33+
Describes compiler intrinsics for processors that use the ARM64 architecture.

0 commit comments

Comments
 (0)