Repo sync for protected CLA branch #4223
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main)
…llowup Followup to cpp-docs 4202 to fix style, grammar issues
…//github.com/MicrosoftDocs/cpp-docs (branch main) (#4571) * 10/11/2022 AM Publish (#4570) * Document ARM64 unwind handling for return address signing * Update date, fix step numbers * Fix style, grammar in Arm64 Exception Co-authored-by: opbld17 <[email protected]> Co-authored-by: Colin Robertson <[email protected]> Co-authored-by: opbld16 <[email protected]> Co-authored-by: opbld15 <[email protected]> Co-authored-by: Martin Storsjö <[email protected]> Co-authored-by: prmerger-automator[bot] <40007230+prmerger-automator[bot]@users.noreply.github.com> * example needed to mitigate dev floundering (#4210) It is not easy to match up variant vt types with POD types. Especially since there is a gradual transition to modern C++. I used a number of dev hours on attempts to match the variant type, vt, to make the true/false work. The m_bValue type for the simple property was a BOOL type, but trying to create a variant of type BOOL directly didn't work. Only by looking at VC Sample code for VisualStudioDemo did I see the (_variant_t)true construct, which becomes the standard_cast contruct in modern C++. I figured my Example code could make other programmer's efforts easier. Co-authored-by: Taojunshen <[email protected]> Co-authored-by: opbld17 <[email protected]> Co-authored-by: Colin Robertson <[email protected]> Co-authored-by: opbld16 <[email protected]> Co-authored-by: opbld15 <[email protected]> Co-authored-by: Martin Storsjö <[email protected]> Co-authored-by: prmerger-automator[bot] <40007230+prmerger-automator[bot]@users.noreply.github.com> Co-authored-by: rtischer8277 <[email protected]>
Resolve syncing conflicts from FromPublicMasterBranch to main
…//github.com/MicrosoftDocs/cpp-docs (branch main) (#4573) * Use the correct canonical opcode name in the packed unwind table This was a leftover from the original tentative name before the real one was known. * Correct Month range in `ok` member description (#4215) Co-authored-by: Martin Storsjö <[email protected]> Co-authored-by: Colin Robertson <[email protected]> Co-authored-by: Christopher Doyle <[email protected]>
cleanup empty remarks and tidy up code example formatting
Adding COM dependency explanation for relog function
removing links to avoid pr issues
Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main)
Update relog.md
Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main)
10/14 AM Publish
|
Learn Build status updates of commit 83d7da5: ✅ Validation status: passedFor more details, please refer to the build report. Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report. For any questions, please:
|
PRMerger Results
|
colin-home
approved these changes
Oct 14, 2022
|
Learn Build status updates of commit 83d7da5: ✅ Validation status: passedFor more details, please refer to the build report. Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report. For any questions, please:
|
PRMerger Results
|
|
@huypub : Thanks for your contribution! The author(s) have been notified to review your proposed change. |
prmerger-automator
bot
added
Change sent to author
cpp-tools/tech
visual-cpp/prod
labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The pull request is created from main638013656556537349sync_temp to main to fix git push error for protected CLA branch