Skip to content

Commit 4e92f9a

Browse files
openpublishbuildColin Robertson
openpublishbuild
authored and
Colin Robertson
committed
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master) (MicrosoftDocs#1571)
* Fix weird wording (MicrosoftDocs#536) Fix some weird wording that appears to say that the compiler will do something when we meant to say the compiler will allow the user's program do such a thing. * Removing std namespace before shuffle() (MicrosoftDocs#537) to be similar to the other <algorithm> functions documentation * typo: paramters -> parameters (MicrosoftDocs#539)
1 parent 7e79352 commit 4e92f9a

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ If your floating-point code does not depend on the order of operations and expre
3232

3333
**/fp:strict** has behavior similar to **/fp:precise**, that is, the compiler preserves the source ordering and rounding properties of floating-point code when it generates and optimizes object code for the target machine, and observes the standard when handling special values. In addition, the program may safely access or modify the floating-point environment at runtime.
3434

35-
Under **/fp:strict**, the compiler may unmask floating-point exceptions, read or write floating-point status registers, or change rounding modes. It rounds to source code precision at four specific points during expression evaluation: at assignments, at typecasts, when a floating-point argument is passed to a function call, and when a floating-point value is returned from a function call. Intermediate computations may be performed at machine precision. Typecasts can be used to explicitly round intermediate computations. The compiler does not perform algebraic transformations on floating-point expressions, such as reassociation or distribution, unless the transformation is guaranteed to produce a bitwise identical result. Expressions that involve special values (NaN, +infinity, -infinity, -0.0) are processed according to IEEE-754 specifications. For example, `x != x` evaluates to **true** if x is NaN. Floating-point contractions are not generated under **/fp:strict**.
35+
Under **/fp:strict**, the compiler generates code that allows the program to safely unmask floating-point exceptions, read or write floating-point status registers, or change rounding modes. It rounds to source code precision at four specific points during expression evaluation: at assignments, at typecasts, when a floating-point argument is passed to a function call, and when a floating-point value is returned from a function call. Intermediate computations may be performed at machine precision. Typecasts can be used to explicitly round intermediate computations. The compiler does not perform algebraic transformations on floating-point expressions, such as reassociation or distribution, unless the transformation is guaranteed to produce a bitwise identical result. Expressions that involve special values (NaN, +infinity, -infinity, -0.0) are processed according to IEEE-754 specifications. For example, `x != x` evaluates to **true** if x is NaN. Floating-point contractions are not generated under **/fp:strict**.
3636

3737
**/fp:strict** is computationally more expensive than **/fp:precise** because the compiler must insert additional instructions to trap exceptions and allow programs to access or modify the floating-point environment at runtime. If your code doesn’t use this capability, but requires source code ordering and rounding, or relies on special values, use **/fp:precise**. Otherwise, consider using **/fp:fast**, which can produce faster and smaller code.
3838

‎docs/cpp/reference-type-function-arguments.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Reference-Type Function Arguments"
33
ms.date: "08/27/2018"
4-
helpviewer_keywords: ["arguments [C++], function", "functions [C++], paramters", "function parameters [C++], reference-type", "function arguments [C++], reference-type", "passing parameters [C++], reference-type arguments"]
4+
helpviewer_keywords: ["arguments [C++], function", "functions [C++], parameters", "function parameters [C++], reference-type", "function arguments [C++], reference-type", "passing parameters [C++], reference-type arguments"]
55
ms.assetid: 0a70e831-9e76-46c0-821d-aeba13d73cc0
66
---
77
# Reference-Type Function Arguments

‎docs/preprocessor/code-seg.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Specifies the text segment where functions are stored in the .obj file.
1414
#pragma code_seg( [ [ { push | pop }, ] [ identifier, ] ] [ "segment-name" [, "segment-class" ] )
1515
```
1616

17-
### Paramters
17+
### Parameters
1818

1919
**push**<br/>
2020
(Optional) Puts a record on the internal compiler stack. A **push** can have an *identifier* and *segment-name*.

‎docs/standard-library/algorithm-functions.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7403,7 +7403,7 @@ int main()
74037403
}
74047404
```
74057405

7406-
## <a name="shuffle"></a> std::shuffle
7406+
## <a name="shuffle"></a> shuffle
74077407

74087408
Shuffles (rearranges) elements for a given range by using a random number generator.
74097409

@@ -8513,4 +8513,4 @@ int main()
85138513

85148514
## See also
85158515

8516-
[\<algorithm>](../standard-library/algorithm.md)<br/>
8516+
[\<algorithm>](../standard-library/algorithm.md)<br/>

0 commit comments

Comments
 (0)