Skip to content

Commit 1cd5f2d

Browse files
authored
Merge pull request #3604 from MicrosoftDocs/master
6/7/2021 AM Publish
2 parents c22672e + 95b2ada commit 1cd5f2d

File tree

4 files changed

+475
-425
lines changed

4 files changed

+475
-425
lines changed

docs/build/cmake-presets-vs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ Use a forward slash (`/`) for paths in `CMakePresets.json` and `CMakeUserPresets
173173

174174
### Add new Configure Presets
175175

176-
To add a new Configure Preset to `CMakePresets.json`, from **Solution Explorer**, right-click `CMakePresets.json` from **Folder View** and select **Add Configure Preset** from the shortcut menu. The dialog to select a Configure Preset template appears:
176+
To add a new Configure Preset to `CMakePresets.json`, from **Solution Explorer**, right-click `CMakePresets.json` from **Folder View** and select **Add Configuration** from the shortcut menu. The dialog to select a Configure Preset template appears:
177177

178178
![Screenshot of the dialog for adding a Configure Preset to the J S O N file.](./media/add-configure-preset-to-cmakepresets.png)
179179

@@ -451,4 +451,4 @@ Learn more about configuring and debugging CMake projects in Visual Studio:
451451
> [Customize CMake build settings](customize-cmake-settings.md)<br/><br/>
452452
> [Configure CMake debugging sessions](configure-cmake-debugging-sessions.md)<br/><br/>
453453
> [CMake predefined configuration reference](cmake-predefined-configuration-reference.md)
454-
>
454+
>

docs/build/tips-for-improving-time-critical-code.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ For more information, see [Idle Loop Processing](../mfc/idle-loop-processing.md)
119119

120120
Smaller working sets mean better locality of reference, fewer page faults, and more cache hits. The process working set is the closest metric the operating system directly provides for measuring locality of reference.
121121

122-
- To set the upper and lower limits of the working set, use [SetProcessWorkingSetSize](/windows/win32/api/winbase/nf-winbase-getprocessworkingsetsize).
122+
- To set the upper and lower limits of the working set, use [`SetProcessWorkingSetSize`](/windows/win32/api/memoryapi/nf-memoryapi-setprocessworkingsetsize).
123123

124-
- To get the upper and lower limits of the working set, use [GetProcessWorkingSetSize](/windows/win32/api/winbase/nf-winbase-setprocessworkingsetsize).
124+
- To get the upper and lower limits of the working set, use [`GetProcessWorkingSetSize`](/windows/win32/api/memoryapi/nf-memoryapi-getprocessworkingsetsize).
125125

126126
- To view the size of the working set, use Spy++.
127127

docs/cppcx/crt-functions-not-supported-in-universal-windows-platform-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The following table lists the CRT functions that are unavailable when you build
1616
|-|-|-|
1717
|`_beep` `_sleep` `_seterrormode`|These functions were obsolete in previous versions of the CRT. Also, the corresponding Win32 APIs are not available for UWP apps.|No workaround.|
1818
|`chdir` `_chdrive` `getcwd`|These functions are obsolete or are not thread-safe.|Use `_chdir`, `_getcwd` and related functions.|
19-
|`_cgets` `_cgets_s` `_cgetws` `_cgetws_s` `_cprintf` `_cprintf_l` `_cprintf_p` `_cprintf_p_l` `_cprintf_s` `_cprintf_s_l` `_cputs` `_cputws` `_cscanf` `_cscanf_l` `_cscanf_s` `_cscanf_s_l` `_cwait` `_cwprintf` `_cwprintf_l` `_cwprintf_p` `_cwprintf_p_l` `_cwprintf_s` `_cwprintf_s_l` `_cwscanf` `_cwscanf_l` `_cwscanf_s` `_cwscanf_s_l` `_vcprintf` `_vcprintf_l` `_vcprintf_p` `_vcprintf_p_l` `_vcprintf_s` `_vcprintf_s_l` `_vcwprintf` `_vcwprintf_l` `_vcwprintf_p` `_vcwprintf_p_l` `_vcwprintf_s` `_vcwprintf_s_l` `_getch` `_getch_nolock` `_getche` `_getche_nolock` `_getwch` `_getwch_nolock` `_getwche` `_getwche_nolock` `_putch` `_putch_nolock` `_putwch` `_putwch_nolock` `_ungetch` `_ungetch_nolock` `_ungetwch` `_ungetwch_nolock` `_kbhit` `kbhit` `putch` `cgets` `cprintf` `cputs` `cscanf` `cwait` `getch` `getche` `ungetch`|These functions are used to read and write directly from and to the console. UWP apps are GUI only; they don't support console.|No workaround.|
19+
|`_cgets` `_cgets_s` `_cgetws` `_cgetws_s` `_cprintf` `_cprintf_l` `_cprintf_p` `_cprintf_p_l` `_cprintf_s` `_cprintf_s_l` `_cputs` `_cputws` `_cscanf` `_cscanf_l` `_cscanf_s` `_cscanf_s_l` `_cwait` `_cwprintf` `_cwprintf_l` `_cwprintf_p` `_cwprintf_p_l` `_cwprintf_s` `_cwprintf_s_l` `_cwscanf` `_cwscanf_l` `_cwscanf_s` `_cwscanf_s_l` `_vcprintf` `_vcprintf_l` `_vcprintf_p` `_vcprintf_p_l` `_vcprintf_s` `_vcprintf_s_l` `_vcwprintf` `_vcwprintf_l` `_vcwprintf_p` `_vcwprintf_p_l` `_vcwprintf_s` `_vcwprintf_s_l` `_getch` `_getch_nolock` `_getche` `_getche_nolock` `_getwch` `_getwch_nolock` `_getwche` `_getwche_nolock` `_putch` `_putch_nolock` `_putwch` `_putwch_nolock` `_ungetch` `_ungetch_nolock` `_ungetwch` `_ungetwch_nolock` `_kbhit` `kbhit` `putch` `cgets` `cprintf` `cputs` `cscanf` `cwait` `getch` `getche` `ungetch`| These console I/O functions are unavailable in GUI-based UWP apps. | UWP console apps can use these functions. For more information, see [Create a Universal Windows Platform console app](/windows/uwp/launch-resume/console-uwp). |
2020
|`getpid` `_getpid` | These functions are obsolete.|Use the Win32 API `GetCurrentProcessId`.|
2121
|`_getdiskfree`|Not available.|Use the Win32 API `GetDiskFreeSpaceExW`.|
2222
|`_getdrive` `_getdrives`|Corresponding API is not available for UWP apps.|No workaround.|

0 commit comments

Comments
 (0)