Skip to content

Commit 35dd6a5

Browse files
author
Colin Robertson
authored
Merge pull request #2762 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)
2 parents b2b18a1 + 4dde570 commit 35dd6a5

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

docs/assembler/inline/accessing-c-or-cpp-data-in-asm-blocks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ You can access data members in C++ without regard to access restrictions. Howeve
6666

6767
## See also
6868

69-
[Using C or C++ in __asm Blocks](../../assembler/inline/using-c-or-cpp-in-asm-blocks.md)<br/>
69+
[Using C or C++ in __asm Blocks](../../assembler/inline/using-c-or-cpp-in-asm-blocks.md)<br/>

docs/cppcx/wrl/eventtargetarray-class.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,14 @@ EventTargetArray(
135135
*hr*<br/>
136136
After this constructor operations, parameter *hr* indicates whether allocation of the array succeeded or failed. The following list shows the possible values for *hr*.
137137

138-
+ S_OK<br/>
139-
The operation succeeded.
138+
- S_OK<br/>
139+
The operation succeeded.
140140

141-
+ E_OUTOFMEMORY<br/>
142-
Memory couldn't be allocated for the array.
141+
- E_OUTOFMEMORY<br/>
142+
Memory couldn't be allocated for the array.
143143

144-
+ S_FALSE<br/>
145-
Parameter *items* is less than or equal to zero.
144+
- S_FALSE<br/>
145+
Parameter *items* is less than or equal to zero.
146146

147147
*items*<br/>
148148
The number of array elements to allocate.

docs/mfc/reference/exception-processing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ See the example for [CATCH](#catch).
188188

189189
### Requirements
190190

191-
**Header** afx.h
191+
**Header** afx.h
192192

193193
## <a name="and_catch_all"></a> AND_CATCH_ALL
194194

docs/windows/deploying-visual-cpp-application-by-using-the-vcpp-redistributable-package.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ You must have these components to complete this walkthrough:
1818

1919
### To use the Visual C++ Redistributable Package to deploy an application
2020

21-
1. Create and build an MFC application by following the steps in [Walkthrough: Deploying a Visual C++ Application By Using a Setup Project](walkthrough-deploying-a-visual-cpp-application-by-using-a-setup-project.md).
21+
1. Create and build an MFC application by following the steps in [Walkthrough: Deploying a Visual C++ Application By Using a Setup Project](walkthrough-deploying-a-visual-cpp-application-by-using-a-setup-project.md).
2222

2323
1. Create a file, name it setup.bat, and add the following commands to it. Change `MyMFCApplication` to the name of your project.
2424

0 commit comments

Comments
 (0)