Skip to content

Commit 7aa2f31

Browse files
authored
Merge pull request #1590 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)
2 parents 8179404 + 7c05ebd commit 7aa2f31

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

docs/ide/refactoring/change-signature.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ms.assetid: 8daaa060-7305-4035-99d2-8b460b4f4454
3232
| Button | Description
3333
| ------ | ---
3434
| **Up/Down** | Move the selected parameter up and down the list
35-
| **Add** | Add a new paramater to the list
35+
| **Add** | Add a new parameter to the list
3636
| **Remove** | Remove the selected parameter from the list
3737
| **Modify** | Modify the selected parameter by changing its type, name, and whether it is optional, and what its injected value would be
3838
| **Revert** | Restore the selected parameter its original state

docs/windows/runtimeclass-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ template <unsigned int classFlags, typename ...TInterfaces> class RuntimeClass;
2222
### Parameters
2323
2424
*classFlags*<br/>
25-
Optional paramater. A combination of one or more [RuntimeClassType](../windows/runtimeclasstype-enumeration.md) enumeration values. The `__WRL_CONFIGURATION_LEGACY__` macro can be defined to change the default value of classFlags for all runtime classes in the project. If defined, RuntimeClass instances are non-agile by default. When not defined, RuntimeClass instances are agile by default. To avoid ambiguity always specify the `Microsoft::WRL::FtmBase` in `TInterfaces` or `RuntimeClassType::InhibitFtmBase`. Note, if InhibitFtmBase and FtmBase are both used the object will be agile.
25+
Optional parameter. A combination of one or more [RuntimeClassType](../windows/runtimeclasstype-enumeration.md) enumeration values. The `__WRL_CONFIGURATION_LEGACY__` macro can be defined to change the default value of classFlags for all runtime classes in the project. If defined, RuntimeClass instances are non-agile by default. When not defined, RuntimeClass instances are agile by default. To avoid ambiguity always specify the `Microsoft::WRL::FtmBase` in `TInterfaces` or `RuntimeClassType::InhibitFtmBase`. Note, if InhibitFtmBase and FtmBase are both used the object will be agile.
2626
2727
*TInterfaces*<br/>
2828
The list of interfaces the object implements beyond `IUnknown`, `IInspectable` or other interfaces controlled by [RuntimeClassType](../windows/runtimeclasstype-enumeration.md). It also may list other classes to be derived from, notably `Microsoft::WRL::FtmBase` to make the object agile and cause it to implement `IMarshal`.

0 commit comments

Comments
 (0)