Skip to content

Commit 04c811d

Browse files
john-parjohn-par
committed
1769497, fixing merge conflicts.
2 parents 4367a19 + 046fa0b commit 04c811d

File tree

97 files changed

+1149
-606
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1149
-606
lines changed

‎docs/atl/atl-collection-classes.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "ATL Collection Classes"
2+
title: "ATL collection class overview"
33
ms.date: "11/19/2018"
44
helpviewer_keywords: ["DestructElements function", "collection classes, choosing", "ConstructElements function", "SerializeElements function", "traits classes", "collection classes, about collection classes", "CTraits classes", "collection classes"]
55
ms.assetid: 4d619d46-5b4e-41dd-b9fd-e86b1fbc00b5

‎docs/atl/collection-classes.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "ATL Collection Classes"
2+
title: "Collection classes in ATL"
33
ms.date: "11/04/2016"
44
ms.topic: "reference"
55
helpviewer_keywords: ["collection classes"]
@@ -79,7 +79,7 @@ The following classes provide support for arrays, lists, maps, and also traits m
7979

8080
## Related Articles
8181

82-
[ATL Collection Classes](../atl/atl-collection-classes.md)
82+
[ATL collection class overview](../atl/atl-collection-classes.md)
8383

8484
## See also
8585

‎docs/atl/understanding-parse-trees.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ You can define one or more parse trees in your registrar script, where each pars
1212
1313
where:
1414

15-
> \<root key> ::= HKEY_CLASSES_ROOT | HKEY_CURRENT_USER |\
16-
> &nbsp;&nbsp;&nbsp;&nbsp;HKEY_LOCAL_MACHINE | HKEY_USERS |\
17-
> &nbsp;&nbsp;&nbsp;&nbsp;HKEY_PERFORMANCE_DATA | HKEY_DYN_DATA |\
18-
> &nbsp;&nbsp;&nbsp;&nbsp;HKEY_CURRENT_CONFIG | HKCR | HKCU |\
19-
> &nbsp;&nbsp;&nbsp;&nbsp;HKLM | HKU | HKPD | HKDD | HKCC
15+
> \<root key> ::= HKEY_CLASSES_ROOT \| HKEY_CURRENT_USER \|\
16+
> &emsp;HKEY_LOCAL_MACHINE \| HKEY_USERS \|\
17+
> &emsp;HKEY_PERFORMANCE_DATA \| HKEY_DYN_DATA \|\
18+
> &emsp;HKEY_CURRENT_CONFIG \| HKCR \| HKCU \|\
19+
> &emsp;HKLM \| HKU \| HKPD \| HKDD \| HKCC
2020
21-
> \<registry expression> ::= \<Add Key> | \<Delete Key>
21+
> \<registry expression> ::= \<Add Key> \| \<Delete Key>
2222
23-
> \<Add Key> ::= [**ForceRemove** | **NoRemove** | **val**]\<Key Name> [\<Key Value>][{\<Add Key>}]
23+
> \<Add Key> ::= \[**ForceRemove** \| **NoRemove** \| **val**]\<Key Name> [\<Key Value>][{\<Add Key>}]
2424
2525
> \<Delete Key> ::= **Delete**\<Key Name>
2626
@@ -30,7 +30,7 @@ where:
3030
3131
> \<Key Value> ::= \<Key Type>\<Key Name>
3232
33-
> \<Key Type> ::= **s** | **d**
33+
> \<Key Type> ::= **s** \| **d**
3434
3535
> \<Key Value> ::= **'**\<AlphaNumeric>**'**
3636

‎docs/build-insights/reference/sdk/c-event-data-types/cl-pass-data-struct.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ typedef struct CL_PASS_DATA_TAG
2929

3030
## Members
3131

32-
| | |
32+
| Name | Description |
3333
|--|--|
3434
| `TranslationUnitPassCode` | A code identifying the compilation pass being executed. For more information, see [TRANSLATION_UNIT_PASS_CODE](translation-unit-pass-code-enum.md). |
3535
| `InputSourcePath` | The C or C++ source file on which this compilation pass is being executed. |

‎docs/build-insights/reference/sdk/c-event-data-types/event-collection-data-struct.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ typedef struct EVENT_COLLECTION_DATA_TAG
2828

2929
## Members
3030

31-
| | |
31+
| Name | Description |
3232
|--|--|
3333
| `Count` | The number of `EVENT_DATA` elements in the array. |
3434
| `Elements` | Pointer to the first `EVENT_DATA` element in the array. |

‎docs/build-insights/reference/sdk/c-event-data-types/event-data-struct.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ typedef struct EVENT_DATA_TAG
4646

4747
## Members
4848

49-
| | |
49+
| Name | Description |
5050
|--|--|
5151
| `EventId` | A number that identifies the event. For a list of event identifiers, see [EVENT_ID](event-id-enum.md). |
5252
| `EventInstanceId` | A number that uniquely identifies the current event inside a trace. This value doesn't change when analyzing or relogging the same trace multiple times. Use this field to identify the same event in multiple analysis or relogging passes over the same trace. |

‎docs/build-insights/reference/sdk/c-event-data-types/file-data-struct.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ typedef struct FILE_DATA_TAG
2828

2929
## Members
3030

31-
| | |
31+
| Name | Description |
3232
|--|--|
3333
| `Path` | The file's absolute path |
3434
| `TypeCode` | A code describing the type of the file. For more information, see [FILE_TYPE_CODE](file-type-code-enum.md). |

‎docs/build-insights/reference/sdk/c-event-data-types/front-end-file-data-struct.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ typedef struct FRONT_END_FILE_DATA_TAG
2727

2828
## Members
2929

30-
| | |
30+
| Name | Description |
3131
|--|--|
3232
| `Path` | The file's absolute path, encoded in UTF-8. |
3333

‎docs/build-insights/reference/sdk/c-event-data-types/function-data-struct.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ typedef struct FUNCTION_DATA_TAG
2727

2828
## Members
2929

30-
| | |
30+
| Name | Description |
3131
|--|--|
3232
| `Name` | The function's name, encoded in UTF-8. |
3333

‎docs/build-insights/reference/sdk/c-event-data-types/function-force-inlinee-data-struct.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ typedef struct FUNCTION_FORCE_INLINEE_DATA_TAG
2828

2929
## Members
3030

31-
| | |
31+
| Name | Description |
3232
|--|--|
3333
| `Name` | The function's name, encoded in UTF-8. |
3434
| `Size` | The function's size, as a number of intermediate instructions. |

0 commit comments

Comments
 (0)