Skip to content

Commit 6c0a77f

Browse files
author
Colin Robertson
authored
Merge pull request #1664 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)
2 parents 82454cd + 1ea5b1b commit 6c0a77f

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

docs/build/reference/fp-specify-floating-point-behavior.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ The [/Za](../../build/reference/za-ze-disable-language-extensions.md) (ANSI comp
5858

5959
### Using Pragmas to Control Floating-Point Behavior
6060

61-
The compiler provides three pragma directivess to override the floating-point behavior specified on the command-line: [float_control](../../preprocessor/float-control.md), [fenv_access](../../preprocessor/fenv-access.md), and [fp_contract](../../preprocessor/fp-contract.md). You can use these pragmas to control floating-point behavior at function-level, not within a function. Note that these pragmas do not correspond directly to the **/fp** options. This table shows how the **/fp** options and pragmas map to each other. For more information, see the documentation for the individual options and pragmas.
61+
The compiler provides three pragma directives to override the floating-point behavior specified on the command-line: [float_control](../../preprocessor/float-control.md), [fenv_access](../../preprocessor/fenv-access.md), and [fp_contract](../../preprocessor/fp-contract.md). You can use these pragmas to control floating-point behavior at function-level, not within a function. Note that these pragmas do not correspond directly to the **/fp** options. This table shows how the **/fp** options and pragmas map to each other. For more information, see the documentation for the individual options and pragmas.
6262

6363
||float_control(precise)|float_control(except)|fenv_access|fp_contract|
6464
|-|-|-|-|-|

docs/c-runtime-library/reference/remove-wremove.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Path of file to be removed.
3030

3131
## Return Value
3232

33-
Each of these functions returns 0 if the file is successfully deleted. Otherwise, it returns -1 and sets **errno** either to **EACCES** to indicate that the path specifies a read-only file or the file is open, or to **ENOENT** to indicate that the filename or path was not found or that the path specifies a directory.
33+
Each of these functions returns 0 if the file is successfully deleted. Otherwise, it returns -1 and sets **errno** either to **EACCES** to indicate that the path specifies a read-only file, specifies a directory, or the file is open, or to **ENOENT** to indicate that the filename or path was not found.
3434

3535
See [_doserrno, errno, _sys_errlist, and _sys_nerr](../../c-runtime-library/errno-doserrno-sys-errlist-and-sys-nerr.md) for more information on these and other return codes.
3636

docs/c-runtime-library/reference/unlink-wunlink.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Name of file to remove.
3030

3131
## Return Value
3232

33-
Each of these functions returns 0 if successful. Otherwise, the function returns -1 and sets **errno** to **EACCES**, which means the path specifies a read-only file, or to **ENOENT**, which means the file or path is not found or the path specified a directory.
33+
Each of these functions returns 0 if successful. Otherwise, the function returns -1 and sets **errno** to **EACCES**, which means the path specifies a read-only file or a directory, or to **ENOENT**, which means the file or path is not found.
3434

3535
See [_doserrno, errno, _sys_errlist, and _sys_nerr](../../c-runtime-library/errno-doserrno-sys-errlist-and-sys-nerr.md) for more information on these, and other, return codes.
3636

docs/preprocessor/detect-mismatch.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Places a record in an object. The linker checks these records for potential mism
1111
## Syntax
1212

1313
```
14-
#pragma detect_mismatch( "name", "value"))
14+
#pragma detect_mismatch("name", "value")
1515
```
1616

1717
## Remarks
@@ -40,4 +40,4 @@ If you compile both of these files by using the command line `cl pragma_directiv
4040

4141
## See Also
4242

43-
[Pragma Directives and the __Pragma Keyword](../preprocessor/pragma-directives-and-the-pragma-keyword.md)
43+
[Pragma Directives and the __Pragma Keyword](../preprocessor/pragma-directives-and-the-pragma-keyword.md)

0 commit comments

Comments
 (0)