Skip to content

Commit 5b12624

Browse files
authored
Merge pull request #4113 from corob-msft/bulk-fix-pipe-entities-6-of-n
Fix more pipe entity issues 6 of n
2 parents 057bd96 + 5235dc9 commit 5b12624

8 files changed

Lines changed: 16 additions & 16 deletions

File tree

docs/error-messages/compiler-warnings/compiler-warning-c4746.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.assetid: 5e79ab46-6031-499a-a986-716c866b6c0e
88
---
99
# Compiler Warning C4746
1010

11-
volatile access of '\<expression>' is subject to /volatile:[iso&#124;ms] setting; consider using __iso_volatile_load/store intrinsic functions.
11+
volatile access of '\<expression>' is subject to /volatile:[iso\|ms] setting; consider using __iso_volatile_load/store intrinsic functions.
1212

1313
C4746 is emitted whenever a volatile variable is accessed directly. It's intended to help developers identify code locations that are affected by the specific volatile model currently specified (which can be controlled with the [`/volatile`](../../build/reference/volatile-volatile-keyword-interpretation.md) compiler option). In particular, it can be useful in locating compiler-generated hardware memory barriers when `/volatile:ms` is used.
1414

docs/parallel/amp/graphics-cpp-amp.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ C++ AMP contains several APIs in the [Concurrency::graphics](../../parallel/amp/
1616

1717
## The norm and unorm Types
1818

19-
The `norm` and `unorm` types are scalar types that limit the range of **`float`** values; this is known as *clamping*. These types can be explicitly constructed from other scalar types. In casting, the value is first cast to **`float`** and then clamped to the respective region that's allowed by norm [-1.0, 1.0] or unorm [0.0, 1.0]. Casting from +/- infinity returns +/-1. Casting from NaN is undefined. A norm can be implicitly constructed from a unorm and there is no loss of data. The implicit conversion operator to float is defined on these types. Binary operators are defined between these types and other built-in scalar types such as **`float`** and **`int`**: +, -, \*, /, ==, !=, >, \<, >=, <=. The compound assignment operators are also supported: +=, -=, \*=, /=. The unary negation operator (-) is defined for norm types.
19+
The `norm` and `unorm` types are scalar types that limit the range of **`float`** values; this is known as *clamping*. These types can be explicitly constructed from other scalar types. In casting, the value is first cast to **`float`** and then clamped to the respective region that's allowed by `norm [-1.0, 1.0]` or `unorm [0.0, 1.0]`. Casting from +/- infinity returns +/-1. Casting from NaN is undefined. A `norm` can be implicitly constructed from a `unorm` and there is no loss of data. The implicit conversion operator to **`float`** is defined on these types. Binary operators are defined between these types and other built-in scalar types such as **`float`** and **`int`**: `+`, `-`, `*`, `/`, `==`, `!=`, `>`, `<`, `>=`, `<=`. The compound assignment operators are also supported: `+=`, `-=`, `*=`, `/=`. The unary negation operator (`-`) is defined for `norm` types.
2020

2121
## Short Vector Library
2222

@@ -35,20 +35,20 @@ The Short Vector Library provides some of the functionality of the [Vector Type]
3535

3636
If an operator is defined between two short vectors, then it is also defined between a short vector and a scalar. Also, one of these must be true:
3737

38-
- The scalars type must be the same as the short vectors element type.
38+
- The scalar's type must be the same as the short vector's element type.
3939

40-
- The scalars type can be implicitly converted to the vectors element type by using only one user-defined conversion.
40+
- The scalar's type can be implicitly converted to the vector's element type by using only one user-defined conversion.
4141

4242
The operation is carried component-wise between each component of the short vector and the scalar. Here are the valid operators:
4343

4444
|Operator type|Valid types|
4545
|-------------------|-----------------|
46-
|Binary operators|Valid on all types: +, -, \*, /,<br /><br /> Valid on integer types: %, ^, &#124;, &, <\<, >><br /><br /> The two vectors must have the same size, and the result is a vector of the same size.|
47-
|Relational operators|Valid on all types: == and !=|
48-
|Compound assignment operator|Valid on all types: +=, -=, \*=, /=<br /><br /> Valid on integer types: %=, ^=, &#124;=, &=, <\<=, >>=|
49-
|Increment and decrement operators|Valid on all types: ++, --<br /><br /> Both prefix and postfix are valid.|
50-
|Bitwise NOT operator (~)|Valid on integer types.|
51-
|Unary - operator|Valid on all types except `unorm` and `uint`.|
46+
|Binary operators|Valid on all types: `+`, `-`, `*`, `/`,<br /><br /> Valid on integer types: `%`, `^`, `|`, `&`, `<<`, `>>`<br /><br /> The two vectors must have the same size, and the result is a vector of the same size.|
47+
|Relational operators|Valid on all types: `==` and `!=`|
48+
|Compound assignment operator|Valid on all types: `+=`, `-=`, `*=`, `/=`<br /><br /> Valid on integer types: `%=`, `^=`, `|=`, `&=`, `<<=`, `>>=`|
49+
|Increment and decrement operators|Valid on all types: `++`, `--`<br /><br /> Both prefix and postfix are valid.|
50+
|Bitwise NOT operator (`~`)|Valid on integer types.|
51+
|Unary `-` operator|Valid on all types except `unorm` and `uint`.|
5252

5353
### Swizzling Expressions
5454

docs/parallel/amp/reference/int-2-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class int_2;
5757
|int_2::operator*=||
5858
|int_2::operator/=||
5959
|int_2::operator^=||
60-
|int_2::operator&#124;=||
60+
|int_2::operator\|=||
6161
|int_2::operator~||
6262
|int_2::operator++||
6363
|int_2::operator+=||

docs/parallel/amp/reference/int-3-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class int_3;
8181
|int_3::operator*=||
8282
|int_3::operator/=||
8383
|int_3::operator^=||
84-
|int_3::operator&#124;=||
84+
|int_3::operator\|=||
8585
|int_3::operator~||
8686
|int_3::operator++||
8787
|int_3::operator+=||

docs/parallel/amp/reference/int-4-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ class int_4;
181181
|int_4::operator*=||
182182
|int_4::operator/=||
183183
|int_4::operator^=||
184-
|int_4::operator&#124;=||
184+
|int_4::operator\|=||
185185
|int_4::operator~||
186186
|int_4::operator++||
187187
|int_4::operator+=||

docs/parallel/amp/reference/uint-2-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class uint_2;
5656
|uint_2::operator*=||
5757
|uint_2::operator/=||
5858
|uint_2::operator^=||
59-
|uint_2::operator&#124;=||
59+
|uint_2::operator\|=||
6060
|uint_2::operator~||
6161
|uint_2::operator++||
6262
|uint_2::operator+=||

docs/parallel/amp/reference/uint-3-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class uint_3;
8080
|uint_3::operator*=||
8181
|uint_3::operator/=||
8282
|uint_3::operator^=||
83-
|uint_3::operator&#124;=||
83+
|uint_3::operator\|=||
8484
|uint_3::operator~||
8585
|uint_3::operator++||
8686
|uint_3::operator+=||

docs/parallel/concrt/reference/concurrency-namespace.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ namespace concurrency;
203203
|----------|-----------------|
204204
|[operator!=](concurrency-namespace-operators.md#operator_neq)|Tests if the `concurrent_vector` object on the left side of the operator is not equal to the `concurrent_vector` object on the right side.|
205205
|[operator&&](concurrency-namespace-operators.md#operator_amp_amp)|Overloaded. Creates a task that will complete successfully when both of the tasks supplied as arguments complete successfully.|
206-
|[operator&#124;&#124;](concurrency-namespace-operators.md#operator_lor)|Overloaded. Creates a task that will complete successfully when either of the tasks supplied as arguments completes successfully.|
206+
|[`operator||`](concurrency-namespace-operators.md#operator_lor)|Overloaded. Creates a task that will complete successfully when either of the tasks supplied as arguments completes successfully.|
207207
|[operator<](concurrency-namespace-operators.md#operator_lt)|Tests if the `concurrent_vector` object on the left side of the operator is less than the `concurrent_vector` object on the right side.|
208208
|[operator<=](concurrency-namespace-operators.md#operator_lt_eq)|Tests if the `concurrent_vector` object on the left side of the operator is less than or equal to the `concurrent_vector` object on the right side.|
209209
|[operator==](concurrency-namespace-operators.md#operator_eq_eq)|Tests if the `concurrent_vector` object on the left side of the operator is equal to the `concurrent_vector` object on the right side.|

0 commit comments

Comments
 (0)