Skip to content

Commit b0c662c

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/cpp-docs-pr into ConsolidateTopics1395170-3
2 parents f163299 + e850a9b commit b0c662c

73 files changed

Lines changed: 252 additions & 269 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: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2694,6 +2694,11 @@
26942694
"redirect_url": "/cpp/dotnet/pure-and-verifiable-code-cpp-cli",
26952695
"redirect_document_id": false
26962696
},
2697+
{
2698+
"source_path": "docs/dotnet/mixed-pure-and-verifiable-feature-comparison-cpp-cli.md",
2699+
"redirect_url": "/cpp/dotnet/pure-and-verifiable-code-cpp-cli",
2700+
"redirect_document_id": false
2701+
},
26972702
{
26982703
"source_path": "docs/dotnet/greater-equal-stl-clr.md",
26992704
"redirect_url": "/cpp/dotnet/functional-stl-clr#greater_equal",
@@ -6859,6 +6864,11 @@
68596864
"redirect_url": "/cpp/parallel/amp/reference/reference-cpp-amp",
68606865
"redirect_document_id": false
68616866
},
6867+
{
6868+
"source_path": "docs/parallel/concrt/convert-an-openmp-loop-that uses-exception-handling.md",
6869+
"redirect_url": "/cpp/parallel/concrt/convert-an-openmp-loop-that-uses-exception-handling",
6870+
"redirect_document_id": true
6871+
},
68626872
{
68636873
"source_path": "docs/parallel/concrt/index.md",
68646874
"redirect_url": "/cpp/parallel/concrt/concurrency-runtime",

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
11
---
22
title: "ALIGN (MASM)"
3-
ms.date: "08/30/2018"
3+
ms.date: "01/02/2019"
44
f1_keywords: ["align"]
55
helpviewer_keywords: ["ALIGN directive"]
66
ms.assetid: 1c386b23-439f-4ec3-a6de-74427b25e47f
77
---
88
# ALIGN (MASM)
99

10-
Aligns the next variable or instruction on a byte that is a multiple of *number*.
10+
The **ALIGN** directive aligns the next data element or instruction on an address that is a multiple of its parameter. The parameter must be a power of 2 (for example, 1, 2, 4, and so on) that is less than or equal to the segment alignment.
1111

1212
## Syntax
1313

1414
> ALIGN [[*number*]]
1515
16+
## Remarks
17+
18+
The **ALIGN** directive allows you to specify the beginning offset of a data element or an instruction. Aligned data can improve performance, at the expense of wasted space between data elements. Large performance improvements can be seen when data accesses are on boundaries that fit within cache lines. Accesses on natural boundaries for native types means less time spent in internal hardware realignment microcode.
19+
20+
The need for aligned instructions is rare on modern processors that use a flat addressing model, but may be required for jump targets in older code for other addressing models.
21+
22+
When data is aligned, the skipped space is padded with zeroes. When instructions are aligned, the skipped space is filled with appropriately-sized NOP instructions.
23+
1624
## See also
1725

26+
[EVEN](even.md)<br/>
1827
[Directives Reference](../../assembler/masm/directives-reference.md)<br/>

‎docs/build/exporting-from-a-dll-using-def-files.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
---
22
title: "Exporting from a DLL Using DEF Files"
3-
ms.date: "11/04/2016"
3+
ms.date: "01/09/2018"
44
helpviewer_keywords: ["def files [C++], exporting from DLLs", ".def files [C++], exporting from DLLs", "exporting DLLs [C++], DEF files"]
55
ms.assetid: 9d31eda2-184e-47de-a2ee-a93ebd603f8e
66
---
77
# Exporting from a DLL Using DEF Files
88

9-
A module-definition (.def) file is a text file containing one or more module statements that describe various attributes of a DLL. If you are not using the **__declspec(dllexport)** keyword to export the DLL's functions, the DLL requires a .def file.
9+
A module-definition or DEF file (*.def) is a text file containing one or more module statements that describe various attributes of a DLL. If you are not using the **__declspec(dllexport)** keyword to export the DLL's functions, the DLL requires a DEF file.
1010

11-
A minimal .def file must contain the following module-definition statements:
11+
A minimal DEF file must contain the following module-definition statements:
1212

13-
- The first statement in the file must be the LIBRARY statement. This statement identifies the .def file as belonging to a DLL. The LIBRARY statement is followed by the name of the DLL. The linker places this name in the DLL's import library.
13+
- The first statement in the file must be the LIBRARY statement. This statement identifies the DEF file as belonging to a DLL. The LIBRARY statement is followed by the name of the DLL. The linker places this name in the DLL's import library.
1414

1515
- The EXPORTS statement lists the names and, optionally, the ordinal values of the functions exported by the DLL. You assign the function an ordinal value by following the function's name with an at sign (@) and a number. When you specify ordinal values, they must be in the range 1 through N, where N is the number of functions exported by the DLL. If you want to export functions by ordinal, see [Exporting Functions from a DLL by Ordinal Rather Than by Name](../build/exporting-functions-from-a-dll-by-ordinal-rather-than-by-name.md) as well as this topic.
1616

@@ -25,11 +25,11 @@ EXPORTS
2525
Min @4
2626
```
2727

28-
If you use the [MFC DLL Wizard](../mfc/reference/mfc-dll-wizard.md) to create an MFC DLL, the wizard creates a skeleton .def file for you and automatically adds it to your project. Add the names of the functions to be exported to this file. For non-MFC DLLs, you must create the .def file yourself and add it to your project.
28+
If you use the [MFC DLL Wizard](../mfc/reference/mfc-dll-wizard.md) to create an MFC DLL, the wizard creates a skeleton DEF file for you and automatically adds it to your project. Add the names of the functions to be exported to this file. For non-MFC DLLs, create the DEF file yourself and add it to your project. Then go to **Project** > **Properties** > **Linker** > **Input** > **Module Definition File** and enter the name of the DEF file. Repeat this step for each configuration and platform, or do it all at once by selecting **Configuration = All Configurations**, and **Platform = All Platforms**.
2929

30-
If you are exporting functions in a C++ file, you have to either place the decorated names in the .def file or define your exported functions with standard C linkage by using extern "C". If you need to place the decorated names in the .def file, you can obtain them by using the [DUMPBIN](../build/reference/dumpbin-reference.md) tool or by using the linker [/MAP](../build/reference/map-generate-mapfile.md) option. Note that the decorated names produced by the compiler are compiler specific. If you place the decorated names produced by the Visual C++ compiler into a .def file, applications that link to your DLL must also be built using the same version of Visual C++ so that the decorated names in the calling application match the exported names in the DLL's .def file.
30+
If you are exporting functions in a C++ file, you have to either place the decorated names in the DEF file or define your exported functions with standard C linkage by using extern "C". If you need to place the decorated names in the DEF file, you can obtain them by using the [DUMPBIN](../build/reference/dumpbin-reference.md) tool or by using the linker [/MAP](../build/reference/map-generate-mapfile.md) option. Note that the decorated names produced by the compiler are compiler specific. If you place the decorated names produced by the Visual C++ compiler into a DEF file, applications that link to your DLL must also be built using the same version of Visual C++ so that the decorated names in the calling application match the exported names in the DLL's DEF file.
3131

32-
If you are building an [extension DLL](../build/extension-dlls-overview.md), and exporting using a .def file, place the following code at the beginning and end of your header files that contain the exported classes:
32+
If you are building an [extension DLL](../build/extension-dlls-overview.md), and exporting using a DEF file, place the following code at the beginning and end of your header files that contain the exported classes:
3333

3434
```
3535
#undef AFX_DATA
@@ -41,9 +41,9 @@ If you are building an [extension DLL](../build/extension-dlls-overview.md), and
4141

4242
These lines ensure that MFC variables that are used internally or that are added to your classes are exported (or imported) from your MFC extension DLL. For example, when deriving a class using `DECLARE_DYNAMIC`, the macro expands to add a `CRuntimeClass` member variable to your class. Leaving out these four lines might cause your DLL to compile or link incorrectly or cause an error when the client application links to the DLL.
4343

44-
When building the DLL, the linker uses the .def file to create an export (.exp) file and an import library (.lib) file. The linker then uses the export file to build the DLL file. Executables that implicitly link to the DLL link to the import library when they are built.
44+
When building the DLL, the linker uses the DEF file to create an export (.exp) file and an import library (.lib) file. The linker then uses the export file to build the DLL file. Executables that implicitly link to the DLL link to the import library when they are built.
4545

46-
Note that MFC itself uses .def files to export functions and classes from the MFCx0.dll.
46+
Note that MFC itself uses DEF files to export functions and classes from the MFCx0.dll.
4747

4848
## What do you want to do?
4949

‎docs/build/reference/optimization-best-practices.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The **/Gy** switch is also very useful. It generates a separate COMDAT for each
2626

2727
For linking in 64-bit environments, it is recommended to use the **/OPT:REF,ICF** linker option, and in 32-bit environments, **/OPT:REF** is recommended. For more information, see [/OPT (Optimizations)](../../build/reference/opt-optimizations.md).
2828

29-
It is also strongly recommended to generate debug symbols, even with optimized release builds. It doesn’t effect the generated code, and it makes it a lot easier to debug your application, if need be.
29+
It is also strongly recommended to generate debug symbols, even with optimized release builds. It doesn’t affect the generated code, and it makes it a lot easier to debug your application, if need be.
3030

3131
### Floating-point switches
3232

‎docs/build/reference/sourcelink.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ ms.date: "08/20/2018"
44
f1_keywords: ["/sourcelink"]
55
helpviewer_keywords: ["/SOURCELINK linker option", "/SOURCELINK"]
66
---
7-
# /SOURCELINK (Include Sourcelink file in PDB)
7+
# /SOURCELINK (Include Source Link file in PDB)
88

9-
Specifies a SourceLink configuration file to include in the PDB file generated by the linker.
9+
Specifies a Source Link configuration file to include in the PDB file generated by the linker.
1010

1111
## Syntax
1212

@@ -19,7 +19,7 @@ Specifies a JSON-formatted configuration file that contains a simple mapping of
1919

2020
## Remarks
2121

22-
SourceLink is a language- and source-control agnostic system for providing source debugging for binaries. SourceLink is supported for native C++ binaries starting in Visual Studio 2017 version 15.8. For an overview of SourceLink, see [Source Link](https://github.com/dotnet/designs/blob/master/accepted/diagnostics/source-link.md). For information on how to use SourceLink in your projects and how to generate the SourceLink file as part of your project, see [Using SourceLink](https://github.com/dotnet/sourcelink#using-sourcelink).
22+
Source Link is a language- and source-control agnostic system for providing source debugging for binaries. Source Link is supported for native C++ binaries starting in Visual Studio 2017 version 15.8. For an overview of Source Link, see [Source Link](https://github.com/dotnet/designs/blob/master/accepted/diagnostics/source-link.md). For information on how to use Source Link in your projects and how to generate the SourceLink file as part of your project, see [Using Source Link](https://github.com/dotnet/sourcelink#using-source-link-in-c-projects).
2323

2424
### To set the /SOURCELINK linker option in Visual Studio
2525

‎docs/c-language/c-floating-point-constants.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ You can omit either the digits before the decimal point (the integer portion of
3636

3737
The following examples illustrate some forms of floating-point constants and expressions:
3838

39-
```
39+
```C
4040
15.75
4141
1.575E1 /* = 15.75 */
4242
1575e-2 /* = 15.75 */
@@ -48,16 +48,16 @@ Floating-point constants are positive unless they are preceded by a minus sign (
4848

4949
A floating-point constant without an **f**, **F**, **l**, or **L** suffix has type `double`. If the letter **f** or **F** is the suffix, the constant has type `float`. If suffixed by the letter **l** or **L**, it has type `long double`. For example:
5050

51-
```
52-
100L /* Has type long double */
53-
100F /* Has type float */
51+
```C
52+
10.0L /* Has type long double */
53+
10.0F /* Has type float */
5454
```
5555

5656
Note that the Microsoft C compiler internally represents `long double` the same as type `double`. See [Storage of Basic Types](../c-language/storage-of-basic-types.md) for information about type `double`, `float`, and `long double`.
5757

5858
You can omit the integer portion of the floating-point constant, as shown in the following examples. The number .75 can be expressed in many ways, including the following:
5959

60-
```
60+
```C
6161
.0075e2
6262
0.075e1
6363
.075e1

‎docs/c-runtime-library/bufsiz.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ms.assetid: 94ac04a3-d154-476b-bd89-eefbc7b949ae
1010
## Syntax
1111

1212
```
13-
1413
#include <stdio.h>
1514
```
1615

@@ -21,4 +20,4 @@ ms.assetid: 94ac04a3-d154-476b-bd89-eefbc7b949ae
2120
## See Also
2221

2322
[Stream I/O](../c-runtime-library/stream-i-o.md)<br/>
24-
[Global Constants](../c-runtime-library/global-constants.md)
23+
[Global Constants](../c-runtime-library/global-constants.md)

‎docs/c-runtime-library/clocks-per-sec-clk-tck.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ms.assetid: bc285106-383d-44cb-91bf-276ad7de57bf
1010
## Syntax
1111

1212
```
13-
1413
#include <time.h>
1514
```
1615

@@ -21,4 +20,4 @@ The time in seconds is the value returned by the `clock` function, divided by `C
2120
## See Also
2221

2322
[clock](../c-runtime-library/reference/clock.md)<br/>
24-
[Global Constants](../c-runtime-library/global-constants.md)
23+
[Global Constants](../c-runtime-library/global-constants.md)

‎docs/c-runtime-library/eof-weof.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ms.assetid: a7150563-cdae-4cdf-9798-ad509990e505
1010
## Syntax
1111

1212
```
13-
1413
#include <stdio.h>
1514
```
1615

@@ -30,4 +29,4 @@ WEOF yields the return value, of type **wint_t**, used to signal the end of a wi
3029
[_ungetch, _ungetwch, _ungetch_nolock, _ungetwch_nolock](../c-runtime-library/reference/ungetch-ungetwch-ungetch-nolock-ungetwch-nolock.md)<br/>
3130
[_putch, _putwch](../c-runtime-library/reference/putch-putwch.md)<br/>
3231
[isascii, __isascii, iswascii](../c-runtime-library/reference/isascii-isascii-iswascii.md)<br/>
33-
[Global Constants](../c-runtime-library/global-constants.md)
32+
[Global Constants](../c-runtime-library/global-constants.md)

‎docs/c-runtime-library/errno-constants.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ms.assetid: 47089258-d5a5-4cd8-b193-223894dea0cf
1010
## Syntax
1111

1212
```
13-
1413
#include <errno.h>
1514
```
1615

@@ -131,4 +130,4 @@ The following values are supported for compatibility with Posix. They are requir
131130
132131
## See Also
133132
134-
[Global Constants](../c-runtime-library/global-constants.md)
133+
[Global Constants](../c-runtime-library/global-constants.md)

0 commit comments

Comments
 (0)