Skip to content

Commit 809e5f0

Browse files
fenxuTaojunshenTylerMSFTv-rajagtPRMerger14
authored
Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main) (MicrosoftDocs#4364)
* 6/17/2022 AM Publish (MicrosoftDocs#4361) * update requirements * update dates * updates * update year * removed exception detail * update version info * wording update * Link fixed. * Link fixed. * Link fixed. * Address more `this` issues found during #4327 fix (MicrosoftDocs#4333) * Address more `this` issues found during #4327 fix * Fix missed code formatting * updating this keyword * Acrolinx update * Arm64EC ABI * Fix bot comments * Acrolinx and style updates * update after review * Add EC function name decoration section * Remove duplicated typedef * Add decorated names updates * update after review * Update per David Lowndes issue * Also update merge modules article * fix typo * PR feedback * updating this keyword * resolving error * Fix a typo in Decorated names * Typo "MSBUILD.exe"→"MSBuild.exe" https://docs.microsoft.com/en-us/cpp/build/reference/mp-build-with-multiple-processes?view=msvc-170 https://github.com/MicrosoftDocs/cpp-docs/blob/main/docs/build/reference/mp-build-with-multiple-processes.md #PingMSFTDocs * Ranges (#4314) * draft * add begin() * add stubs * work * added art * days work * finish draft of namespace level functions * fix filenames * cleanup pass * minor update * stash * clean up adaptors sectin * start discussion of views and range adaptors * fix return value heading * tech review * acrolinx type fixes * Update docs/standard-library/range-functions.md Co-authored-by: Casey Carter <cartec69@gmail.com> * tech review2 * fix typo * one more typo Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com> Co-authored-by: Casey Carter <cartec69@gmail.com> * Update cmfctoolbar-class.md Description of m_bDontScaleImages was unhelpful (like far to much of Microsoft docs that simply document "DoFoo" as "Does Foo" instead of explaining what "Foo" is and why somebody would want to do it or not.) I copied the documentation from the BCGSoft docs for this. Since much of the MFC was obtained from them, we should use their documentation more. * update after review * Update cmfctoolbar-class.md Tightened up the text a bit and added code escape for TRUE * Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main) (MicrosoftDocs#4347) * 6/8/2022 AM Publish (MicrosoftDocs#4339) * update requirements * update dates * updates * update year * removed exception detail * update version info * wording update * Link fixed. * Link fixed. * Link fixed. * Address more `this` issues found during #4327 fix (MicrosoftDocs#4333) * Address more `this` issues found during #4327 fix * Fix missed code formatting Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com> Co-authored-by: v-rajagt <102556060+v-rajagt@users.noreply.github.com> Co-authored-by: PRMerger14 <prmrgr14@microsoft.com> Co-authored-by: PRMerger7 <prmrgr7@microsoft.com> Co-authored-by: PRMerger12 <prmrgr12@microsoft.com> Co-authored-by: Colin Robertson <corob@microsoft.com> * 6/9/2022 AM Publish (#4342) * update requirements * update dates * updates * update year * removed exception detail * update version info * wording update * Link fixed. * Link fixed. * Link fixed. * Address more `this` issues found during #4327 fix (MicrosoftDocs#4333) * Address more `this` issues found during #4327 fix * Fix missed code formatting * updating this keyword * Acrolinx update * update after review * Remove duplicated typedef * update after review * Update per David Lowndes issue * Also update merge modules article * fix typo Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com> Co-authored-by: v-rajagt <102556060+v-rajagt@users.noreply.github.com> Co-authored-by: PRMerger14 <prmrgr14@microsoft.com> Co-authored-by: PRMerger7 <prmrgr7@microsoft.com> Co-authored-by: PRMerger12 <prmrgr12@microsoft.com> Co-authored-by: Colin Robertson <corob@microsoft.com> Co-authored-by: opbld17 <opbld17@microsoft.com> Co-authored-by: rachana-satao <83084319+rachana-satao@users.noreply.github.com> Co-authored-by: opbld16 <opbld16@microsoft.com> Co-authored-by: Tomohiro Endo <europeanplaice@gmail.com> Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: PRMerger16 <prmrgr16@microsoft.com> Co-authored-by: Tamara K <93546702+tamarakhader@users.noreply.github.com> Co-authored-by: Haig MacGregor <92189915+hmacgregor1@users.noreply.github.com> * 6/10/2022 AM Publish (#4345) * update requirements * update dates * updates * update year * removed exception detail * update version info * wording update * Link fixed. * Link fixed. * Link fixed. * Address more `this` issues found during #4327 fix (MicrosoftDocs#4333) * Address more `this` issues found during #4327 fix * Fix missed code formatting * updating this keyword * Acrolinx update * update after review * Remove duplicated typedef * update after review * Update per David Lowndes issue * Also update merge modules article * fix typo Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com> Co-authored-by: v-rajagt <102556060+v-rajagt@users.noreply.github.com> Co-authored-by: PRMerger14 <prmrgr14@microsoft.com> Co-authored-by: PRMerger7 <prmrgr7@microsoft.com> Co-authored-by: PRMerger12 <prmrgr12@microsoft.com> Co-authored-by: Colin Robertson <corob@microsoft.com> Co-authored-by: opbld17 <opbld17@microsoft.com> Co-authored-by: rachana-satao <83084319+rachana-satao@users.noreply.github.com> Co-authored-by: opbld16 <opbld16@microsoft.com> Co-authored-by: Tomohiro Endo <europeanplaice@gmail.com> Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: PRMerger16 <prmrgr16@microsoft.com> Co-authored-by: Tamara K <93546702+tamarakhader@users.noreply.github.com> Co-authored-by: Haig MacGregor <92189915+hmacgregor1@users.noreply.github.com> * Update cmfctoolbar-class.md Description of m_bDontScaleImages was unhelpful (like far to much of Microsoft docs that simply document "DoFoo" as "Does Foo" instead of explaining what "Foo" is and why somebody would want to do it or not.) I copied the documentation from the BCGSoft docs for this. Since much of the MFC was obtained from them, we should use their documentation more. * Update cmfctoolbar-class.md Tightened up the text a bit and added code escape for TRUE Co-authored-by: Taojunshen <v-jutao@microsoft.com> Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com> Co-authored-by: v-rajagt <102556060+v-rajagt@users.noreply.github.com> Co-authored-by: PRMerger14 <prmrgr14@microsoft.com> Co-authored-by: PRMerger7 <prmrgr7@microsoft.com> Co-authored-by: PRMerger12 <prmrgr12@microsoft.com> Co-authored-by: Colin Robertson <corob@microsoft.com> Co-authored-by: opbld15 <opbld15@microsoft.com> Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: opbld17 <opbld17@microsoft.com> Co-authored-by: rachana-satao <83084319+rachana-satao@users.noreply.github.com> Co-authored-by: opbld16 <opbld16@microsoft.com> Co-authored-by: Tomohiro Endo <europeanplaice@gmail.com> Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> Co-authored-by: PRMerger16 <prmrgr16@microsoft.com> Co-authored-by: Tamara K <93546702+tamarakhader@users.noreply.github.com> Co-authored-by: Haig MacGregor <92189915+hmacgregor1@users.noreply.github.com> Co-authored-by: Scot Brennecke <stbrennecke@hotmail.com> * Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main) (#4348) * 6/8/2022 AM Publish (MicrosoftDocs#4339) * update requirements * update dates * updates * update year * removed exception detail * update version info * wording update * Link fixed. * Link fixed. * Link fixed. * Address more `this` issues found during #4327 fix (MicrosoftDocs#4333) * Address more `this` issues found during #4327 fix * Fix missed code formatting Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com> Co-authored-by: v-rajagt <102556060+v-rajagt@users.noreply.github.com> Co-authored-by: PRMerger14 <prmrgr14@microsoft.com> Co-authored-by: PRMerger7 <prmrgr7@microsoft.com> Co-authored-by: PRMerger12 <prmrgr12@microsoft.com> Co-authored-by: Colin Robertson <corob@microsoft.com> * 6/9/2022 AM Publish (#4342) * update requirements * update dates * updates * update year * removed exception detail * update version info * wording update * Link fixed. * Link fixed. * Link fixed. * Address more `this` issues found during #4327 fix (MicrosoftDocs#4333) * Address more `this` issues found during #4327 fix * Fix missed code formatting * updating this keyword * Acrolinx update * update after review * Remove duplicated typedef * update after review * Update per David Lowndes issue * Also update merge modules article * fix typo Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com> Co-authored-by: v-rajagt <102556060+v-rajagt@users.noreply.github.com> Co-authored-by: PRMerger14 <prmrgr14@microsoft.com> Co-authored-by: PRMerger7 <prmrgr7@microsoft.com> Co-authored-by: PRMerger12 <prmrgr12@microsoft.com> Co-authored-by: Colin Robertson <corob@microsoft.com> Co-authored-by: opbld17 <opbld17@microsoft.com> Co-authored-by: rachana-satao <83084319+rachana-satao@users.noreply.github.com> Co-authored-by: opbld16 <opbld16@microsoft.com> Co-authored-by: Tomohiro Endo <europeanplaice@gmail.com> Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: PRMerger16 <prmrgr16@microsoft.com> Co-authored-by: Tamara K <93546702+tamarakhader@users.noreply.github.com> Co-authored-by: Haig MacGregor <92189915+hmacgregor1@users.noreply.github.com> * 6/10/2022 AM Publish (#4345) * update requirements * update dates * updates * update year * removed exception detail * update version info * wording update * Link fixed. * Link fixed. * Link fixed. * Address more `this` issues found during #4327 fix (MicrosoftDocs#4333) * Address more `this` issues found during #4327 fix * Fix missed code formatting * updating this keyword * Acrolinx update * update after review * Remove duplicated typedef * update after review * Update per David Lowndes issue * Also update merge modules article * fix typo Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com> Co-authored-by: v-rajagt <102556060+v-rajagt@users.noreply.github.com> Co-authored-by: PRMerger14 <prmrgr14@microsoft.com> Co-authored-by: PRMerger7 <prmrgr7@microsoft.com> Co-authored-by: PRMerger12 <prmrgr12@microsoft.com> Co-authored-by: Colin Robertson <corob@microsoft.com> Co-authored-by: opbld17 <opbld17@microsoft.com> Co-authored-by: rachana-satao <83084319+rachana-satao@users.noreply.github.com> Co-authored-by: opbld16 <opbld16@microsoft.com> Co-authored-by: Tomohiro Endo <europeanplaice@gmail.com> Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: PRMerger16 <prmrgr16@microsoft.com> Co-authored-by: Tamara K <93546702+tamarakhader@users.noreply.github.com> Co-authored-by: Haig MacGregor <92189915+hmacgregor1@users.noreply.github.com> * Typo "MSBUILD.exe"→"MSBuild.exe" https://docs.microsoft.com/en-us/cpp/build/reference/mp-build-with-multiple-processes?view=msvc-170 https://github.com/MicrosoftDocs/cpp-docs/blob/main/docs/build/reference/mp-build-with-multiple-processes.md #PingMSFTDocs * Update cmfctoolbar-class.md Description of m_bDontScaleImages was unhelpful (like far to much of Microsoft docs that simply document "DoFoo" as "Does Foo" instead of explaining what "Foo" is and why somebody would want to do it or not.) I copied the documentation from the BCGSoft docs for this. Since much of the MFC was obtained from them, we should use their documentation more. * 6/13/2022 AM Publish (MicrosoftDocs#4346) * update requirements * update dates * updates * update year * removed exception detail * update version info * wording update * Link fixed. * Link fixed. * Link fixed. * Address more `this` issues found during #4327 fix (MicrosoftDocs#4333) * Address more `this` issues found during #4327 fix * Fix missed code formatting * updating this keyword * Acrolinx update * update after review * Remove duplicated typedef * update after review * Update per David Lowndes issue * Also update merge modules article * fix typo * Ranges (#4314) * draft * add begin() * add stubs * work * added art * days work * finish draft of namespace level functions * fix filenames * cleanup pass * minor update * stash * clean up adaptors sectin * start discussion of views and range adaptors * fix return value heading * tech review * acrolinx type fixes * Update docs/standard-library/range-functions.md Co-authored-by: Casey Carter <cartec69@gmail.com> * tech review2 * fix typo * one more typo Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com> Co-authored-by: Casey Carter <cartec69@gmail.com> Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com> Co-authored-by: v-rajagt <102556060+v-rajagt@users.noreply.github.com> Co-authored-by: PRMerger14 <prmrgr14@microsoft.com> Co-authored-by: PRMerger7 <prmrgr7@microsoft.com> Co-authored-by: PRMerger12 <prmrgr12@microsoft.com> Co-authored-by: Colin Robertson <corob@microsoft.com> Co-authored-by: opbld17 <opbld17@microsoft.com> Co-authored-by: rachana-satao <83084319+rachana-satao@users.noreply.github.com> Co-authored-by: opbld16 <opbld16@microsoft.com> Co-authored-by: Tomohiro Endo <europeanplaice@gmail.com> Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: PRMerger16 <prmrgr16@microsoft.com> Co-authored-by: Tamara K <93546702+tamarakhader@users.noreply.github.com> Co-authored-by: Haig MacGregor <92189915+hmacgregor1@users.noreply.github.com> Co-authored-by: Casey Carter <cartec69@gmail.com> * Update cmfctoolbar-class.md Tightened up the text a bit and added code escape for TRUE Co-authored-by: Taojunshen <v-jutao@microsoft.com> Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com> Co-authored-by: v-rajagt <102556060+v-rajagt@users.noreply.github.com> Co-authored-by: PRMerger14 <prmrgr14@microsoft.com> Co-authored-by: PRMerger7 <prmrgr7@microsoft.com> Co-authored-by: PRMerger12 <prmrgr12@microsoft.com> Co-authored-by: Colin Robertson <corob@microsoft.com> Co-authored-by: opbld15 <opbld15@microsoft.com> Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: opbld17 <opbld17@microsoft.com> Co-authored-by: rachana-satao <83084319+rachana-satao@users.noreply.github.com> Co-authored-by: opbld16 <opbld16@microsoft.com> Co-authored-by: Tomohiro Endo <europeanplaice@gmail.com> Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> Co-authored-by: PRMerger16 <prmrgr16@microsoft.com> Co-authored-by: Tamara K <93546702+tamarakhader@users.noreply.github.com> Co-authored-by: Haig MacGregor <92189915+hmacgregor1@users.noreply.github.com> Co-authored-by: Hiroshi Yoshioka <40815708+hyoshioka0128@users.noreply.github.com> Co-authored-by: Scot Brennecke <stbrennecke@hotmail.com> Co-authored-by: Casey Carter <cartec69@gmail.com> * Consolidate manifest docs, updates for 3974, 3972, 3954 (MicrosoftDocs#4343) * Consolidate manifest docs, 3972 3954 * Fix build warning * Consolidate See also sections * Add function overloading for 3974 * Fix broken anchor links for redirects * update after review * use capitalized ARM * update docs to clarify volatile flag for ARM64EC * update after review * Add vectorcall doc update for ARM64EC * update F1 help metadata (MicrosoftDocs#4352) * update F1 help metadata * small fixes * fix metadata Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com> * Followup for cpp-docs PR 3977 (MicrosoftDocs#4355) * Edits to improve SEO and usability. (#4350) * Edits to improve SEO and usability. * Incorporate feedback. * resolving blocking issues * updating this keyword -3 (#4353) * updating this keyword-3 * update after review * resolving validation warning * update after review * fix examples * Address C4743 weirdness per 3955 (MicrosoftDocs#4359) Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com> Co-authored-by: v-rajagt <102556060+v-rajagt@users.noreply.github.com> Co-authored-by: PRMerger14 <prmrgr14@microsoft.com> Co-authored-by: PRMerger7 <prmrgr7@microsoft.com> Co-authored-by: PRMerger12 <prmrgr12@microsoft.com> Co-authored-by: Colin Robertson <corob@microsoft.com> Co-authored-by: opbld17 <opbld17@microsoft.com> Co-authored-by: rachana-satao <83084319+rachana-satao@users.noreply.github.com> Co-authored-by: opbld16 <opbld16@microsoft.com> Co-authored-by: Victor Tong <vitong@microsoft.com> Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: Tomohiro Endo <europeanplaice@gmail.com> Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> Co-authored-by: opbld15 <opbld15@microsoft.com> Co-authored-by: PRMerger16 <prmrgr16@microsoft.com> Co-authored-by: Tamara K <93546702+tamarakhader@users.noreply.github.com> Co-authored-by: Haig MacGregor <92189915+hmacgregor1@users.noreply.github.com> Co-authored-by: Hiroshi Yoshioka <40815708+hyoshioka0128@users.noreply.github.com> Co-authored-by: Casey Carter <cartec69@gmail.com> Co-authored-by: Scot Brennecke <stbrennecke@hotmail.com> Co-authored-by: Feng Xu <fenxu@microsoft.com> Co-authored-by: Paula Miller <v-paulmi@microsoft.com> Co-authored-by: Tim Sherer <28902327+TimShererWithAquent@users.noreply.github.com> Co-authored-by: Colin Cooper <72402153+v-ccolin@users.noreply.github.com> Co-authored-by: PRMerger13 <prmrgr13@microsoft.com> * removed typo in macro the asterisk was repeated incorrectly Co-authored-by: Taojunshen <v-jutao@microsoft.com> Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com> Co-authored-by: v-rajagt <102556060+v-rajagt@users.noreply.github.com> Co-authored-by: PRMerger14 <prmrgr14@microsoft.com> Co-authored-by: PRMerger7 <prmrgr7@microsoft.com> Co-authored-by: PRMerger12 <prmrgr12@microsoft.com> Co-authored-by: Colin Robertson <corob@microsoft.com> Co-authored-by: opbld17 <opbld17@microsoft.com> Co-authored-by: rachana-satao <83084319+rachana-satao@users.noreply.github.com> Co-authored-by: opbld16 <opbld16@microsoft.com> Co-authored-by: Victor Tong <vitong@microsoft.com> Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: Tomohiro Endo <europeanplaice@gmail.com> Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> Co-authored-by: opbld15 <opbld15@microsoft.com> Co-authored-by: PRMerger16 <prmrgr16@microsoft.com> Co-authored-by: Tamara K <93546702+tamarakhader@users.noreply.github.com> Co-authored-by: Haig MacGregor <92189915+hmacgregor1@users.noreply.github.com> Co-authored-by: Hiroshi Yoshioka <40815708+hyoshioka0128@users.noreply.github.com> Co-authored-by: Casey Carter <cartec69@gmail.com> Co-authored-by: Scot Brennecke <stbrennecke@hotmail.com> Co-authored-by: Paula Miller <v-paulmi@microsoft.com> Co-authored-by: Tim Sherer <28902327+TimShererWithAquent@users.noreply.github.com> Co-authored-by: Colin Cooper <72402153+v-ccolin@users.noreply.github.com> Co-authored-by: PRMerger13 <prmrgr13@microsoft.com> Co-authored-by: Michał Kozakiewicz <michalkozakiewicz3@gmail.com> Co-authored-by: Courtney Wales <62625502+Court72@users.noreply.github.com>
1 parent b339c55 commit 809e5f0

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

‎docs/build/reference/special-nmake-macros.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Filename macros are predefined as filenames specified in the dependency (not ful
1717
|--|--|
1818
| **`$@`** | Current target's full name (path, base name, extension), as currently specified. |
1919
| **`$$@`** | Current target's full name (path, base name, extension), as currently specified. Valid only as a dependent in a dependency. |
20-
| **`$*`*** | Current target's path and base name minus file extension. |
20+
| **`$*`** | Current target's path and base name minus file extension. |
2121
| **`$**`** | All dependents of the current target. |
2222
| **`$?`** | All dependents with a later timestamp than the current target. |
2323
| **`$<`** | Dependent file with a later timestamp than the current target. Valid only in commands in inference rules. |

0 commit comments

Comments
 (0)