Skip to content

Commit d4da369

Browse files
authored
Merge pull request #2890 from MicrosoftDocs/master
5/18/2020 AM Publish
2 parents c4cf897 + 0968b6f commit d4da369

File tree

5 files changed

+47
-49
lines changed

5 files changed

+47
-49
lines changed

docs/build/reference/md-mt-ld-use-run-time-library.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ For more about DLLs, see [Create C/C++ DLLs in Visual Studio](../dlls-in-visual-
4040

4141
1. Open the project's **Property Pages** dialog box. For details, see [Set C++ compiler and build properties in Visual Studio](../working-with-project-properties.md).
4242

43-
1. Select the **Configuration Properties** > **C/C++** > **Command Line** property page.
44-
45-
1. Select the **Code Generation** property page.
43+
1. Select the **Configuration Properties** > **C/C++** > **Code Generation** property page.
4644

4745
1. Modify the **Runtime Library** property.
4846

docs/build/vscpp-step-0-installation.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
2-
title: Install C++ support in Visual Studio
2+
title: Install C and C++ support in Visual Studio
33
description: "Install Visual Studio support for Visual C++"
44
ms.custom: "mvc"
55
ms.date: "04/02/2019"
66
ms.topic: "tutorial"
77
ms.devlang: "cpp"
88
ms.assetid: 45138d70-719d-42dc-90d7-1d0ca31a2f54
99
---
10-
# Install C++ support in Visual Studio
10+
# Install C and C++ support in Visual Studio
1111

12-
If you haven't downloaded and installed Visual Studio and the Visual C++ tools yet, here's how to get started.
12+
If you haven't downloaded and installed Visual Studio and the Microsoft C/C++ tools yet, here's how to get started.
1313

1414
::: moniker range="vs-2019"
1515

@@ -67,9 +67,9 @@ After the installer is installed, you can use it to customize your installation
6767

6868
![Visual Studio 2019: Install a workload](../get-started/media/vs-installer-workloads.png)
6969

70-
For core C++ support, choose the "Desktop development with C++" workload. It comes with the default core editor, which includes basic code editing support for over 20 languages, the ability to open and edit code from any folder without requiring a project, and integrated source code control.
70+
For core C and C++ support, choose the "Desktop development with C++" workload. It comes with the default core editor, which includes basic code editing support for over 20 languages, the ability to open and edit code from any folder without requiring a project, and integrated source code control.
7171

72-
Additional workloads support other kinds of C++ development. For example, choose the "Universal Windows Platform development" workload to create apps that use the Windows Runtime for the Microsoft Store. Choose "Game development with C++" to create games that use DirectX, Unreal, and Cocos2d. Choose "Linux development with C++" to target Linux platforms, including IoT development.
72+
Additional workloads support other kinds of development. For example, choose the "Universal Windows Platform development" workload to create apps that use the Windows Runtime for the Microsoft Store. Choose "Game development with C++" to create games that use DirectX, Unreal, and Cocos2d. Choose "Linux development with C++" to target Linux platforms, including IoT development.
7373

7474
The **Installation details** pane lists the included and optional components installed by each workload. You can select or deselect optional components in this list. For example, to support development by using the Visual Studio 2017 or 2015 compiler toolsets, choose the MSVC v141 or MSVC v140 optional components. You can add support for MFC, the experimental Modules language extension, IncrediBuild, and more.
7575

@@ -119,7 +119,7 @@ You can reduce the installation footprint of Visual Studio on your system drive.
119119

120120
::: moniker-end
121121

122-
::: moniker range="<=vs-2017"
122+
::: moniker range="vs-2017"
123123

124124
## Visual Studio 2017 Installation
125125

@@ -153,7 +153,7 @@ For details on the disk space and operating system requirements, see [Visual Stu
153153

154154
![Desktop development with C++ workload](media/desktop-development-with-cpp.png "Desktop development with C++")
155155

156-
For C++, select the **Desktop development with C++** workload and then choose **Install**.
156+
For C and C++, select the **Desktop development with C++** workload and then choose **Install**.
157157

158158
![Install the Desktop development with C++ workload](media/vscpp-concierge-choose-workload.gif "Install the Desktop development with C++ workload")
159159

@@ -179,9 +179,9 @@ For details on the disk space and operating system requirements, see [Visual Stu
179179

180180
## Visual Studio 2015 Installation
181181

182-
To install Visual Studio 2015, go to [Download older versions of Visual Studio](https://www.visualstudio.com/vs/older-downloads/). Run the setup program and choose **Custom installation** and then choose the C++ component. To add C++ support to an existing Visual Studio 2015 installation, click on the Windows Start button and type **Add Remove Programs**. Open the program from the results list and then find your Visual Studio 2015 installation in the list of installed programs. Double-click it, then choose **Modify** and select the Visual C++ components to install.
182+
To install Visual Studio 2015, go to [Download older versions of Visual Studio](https://www.visualstudio.com/vs/older-downloads/). Run the setup program and choose **Custom installation** and then choose the C++ component. To add C and C++ support to an existing Visual Studio 2015 installation, click on the Windows Start button and type **Add Remove Programs**. Open the program from the results list and then find your Visual Studio 2015 installation in the list of installed programs. Double-click it, then choose **Modify** and select the Visual C++ components to install.
183183

184-
In general, we highly recommend that you use Visual Studio 2017 even if you need to compile your code using the Visual Studio 2015 compiler. For more information, see [Use native multi-targeting in Visual Studio to build old projects](../porting/use-native-multi-targeting.md).
184+
In general, we highly recommend that you use the latest version of Visual Studio even if you need to compile your code using the Visual Studio 2015 compiler. For more information, see [Use native multi-targeting in Visual Studio to build old projects](../porting/use-native-multi-targeting.md).
185185

186186
::: moniker-end
187187

docs/cpp/keywords-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Keywords are predefined reserved identifiers that have special meanings. They ca
1111

1212
|||||
1313
|-|-|-|-|
14-
|[__abstract](../dotnet/declaration-of-a-managed-class-type.md) <sup>2</sup>|[__alignof Operator](alignof-operator.md) <sup>4</sup>|[__asm](../assembler/inline/asm.md) <sup>4</sup>|[__assume](../intrinsics/assume.md) <sup>4</sup>|
14+
|[__abstract](../dotnet/declaration-of-a-managed-class-type.md) <sup>2</sup>|[__alignof](alignof-operator.md) <sup>4</sup>|[__asm](../assembler/inline/asm.md) <sup>4</sup>|[__assume](../intrinsics/assume.md) <sup>4</sup>|
1515
|[__based](based-pointers-cpp.md) <sup>4</sup>|[__box](../dotnet/value-type-semantics.md) <sup>2</sup>|[__cdecl](cdecl.md) <sup>4</sup>|[__declspec](declspec.md) <sup>4</sup>|
1616
|[__delegate](../dotnet/delegates-and-events.md) <sup>2</sup>|[__event](event.md)|[__except](try-except-statement.md) <sup>4</sup>|[__fastcall](fastcall.md) <sup>4</sup>|
1717
|[__finally](try-finally-statement.md) <sup>4</sup>|[__forceinline](inline-functions-cpp.md) <sup>4</sup>|[__gc](../dotnet/declaration-of-a-clr-reference-class-object.md) <sup>2</sup>|[__hook](hook.md) <sup>3</sup>|

docs/cpp/move-constructors-and-move-assignment-operators-cpp.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ The following example shows the complete move constructor and move assignment op
167167
168168
```cpp
169169
// Move constructor.
170-
MemoryBlock(MemoryBlock&& other)
170+
MemoryBlock(MemoryBlock&& other) noexcept
171171
: _data(nullptr)
172172
, _length(0)
173173
{
@@ -186,7 +186,7 @@ MemoryBlock(MemoryBlock&& other)
186186
}
187187
188188
// Move assignment operator.
189-
MemoryBlock& operator=(MemoryBlock&& other)
189+
MemoryBlock& operator=(MemoryBlock&& other) noexcept
190190
{
191191
std::cout << "In operator=(MemoryBlock&&). length = "
192192
<< other._length << "." << std::endl;
@@ -241,15 +241,15 @@ In MemoryBlock(size_t). length = 25.
241241
In MemoryBlock(MemoryBlock&&). length = 25. Moving resource.
242242
In ~MemoryBlock(). length = 0.
243243
In MemoryBlock(size_t). length = 75.
244+
In MemoryBlock(MemoryBlock&&). length = 75. Moving resource.
244245
In MemoryBlock(MemoryBlock&&). length = 25. Moving resource.
245246
In ~MemoryBlock(). length = 0.
246-
In MemoryBlock(MemoryBlock&&). length = 75. Moving resource.
247247
In ~MemoryBlock(). length = 0.
248248
In MemoryBlock(size_t). length = 50.
249249
In MemoryBlock(MemoryBlock&&). length = 50. Moving resource.
250-
In MemoryBlock(MemoryBlock&&). length = 50. Moving resource.
251-
In operator=(MemoryBlock&&). length = 75.
252-
In operator=(MemoryBlock&&). length = 50.
250+
In MemoryBlock(MemoryBlock&&). length = 25. Moving resource.
251+
In MemoryBlock(MemoryBlock&&). length = 75. Moving resource.
252+
In ~MemoryBlock(). length = 0.
253253
In ~MemoryBlock(). length = 0.
254254
In ~MemoryBlock(). length = 0.
255255
In ~MemoryBlock(). length = 25. Deleting resource.
@@ -292,15 +292,15 @@ If you provide both a move constructor and a move assignment operator for your c
292292

293293
```cpp
294294
// Move constructor.
295-
MemoryBlock(MemoryBlock&& other)
295+
MemoryBlock(MemoryBlock&& other) noexcept
296296
: _data(nullptr)
297297
, _length(0)
298298
{
299299
*this = std::move(other);
300300
}
301301
```
302302
303-
The [std::move](../standard-library/utility-functions.md#move) function preserves the rvalue property of the *other* parameter.
303+
The [std::move](../standard-library/utility-functions.md#move) function converts the lvalue `other` to an rvalue.
304304
305305
## See also
306306

0 commit comments

Comments
 (0)