Skip to content

Commit 59afc95

Browse files
authored
Merge pull request #879 from MicrosoftDocs/master
6/8 AM Publish
2 parents b04de4e + 699222c commit 59afc95

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎docs/mfc/exception-handling-in-mfc.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ This article explains the exception-handling mechanisms available in MFC. Two me
2525
If you have already developed an application using the MFC exception macros, you can continue using these macros in your existing code, while using C++ exceptions in your new code. The article [Exceptions: Changes to Exception Macros in Version 3.0](../mfc/exceptions-changes-to-exception-macros-in-version-3-0.md) gives guidelines for doing so.
2626

2727
> [!NOTE]
28-
> To enable C++ exception handling in your code, select Enable C++ Exceptions on the Code Generation page in the C/C++ folder of the project's [Property Pages](../ide/property-pages-visual-cpp.md) dialog box, or use the /GX compiler option. The default is /GX-, which disables exception handling.
28+
> To enable C++ exception handling in your code, select Enable C++ Exceptions on the Code Generation page in the C/C++ folder of the project's [Property Pages](../ide/property-pages-visual-cpp.md) dialog box, or use the [/EHsc](../build/reference/eh-exception-handling-model.md) compiler option.
2929
3030
This article covers the following topics:
3131

‎docs/mfc/mfc-mbcs-dll-add-on.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Support for MFC and its multibyte character set (MBCS) libraries requires an add
1818

1919
**Visual Studio 2015**: Both Unicode and MBCS MFC DLLs are included in the Visual C++ setup components, but support for MFC is not installed by default. Visual C++ and MFC are optional install configurations in Visual Studio setup. To make sure that MFC is installed, choose **Custom** in setup, and under **Programming Languages**, make sure that **Visual C++** and **Microsoft Foundation Classes for C++** are selected. If you have already installed Visual Studio, you will be prompted to install Visual C++ and/or MFC when you attempt to create an MFC project.
2020

21-
**Visual Studio 2017**: The Unicode and MBCS MFC DLLs are installed with the **Desktop development with C++** workload when you select **MFC and ATL support** from the **Optional Components** pane. If your installation does not include these components, you can launch the installer from the **New Projects** dialog by using the **Open Visual Studio Installer** link.
21+
**Visual Studio 2017**: The Unicode and MBCS MFC DLLs are installed with the **Desktop development with C++** workload when you select **MFC and ATL support** from the **Optional Components** pane. If your installation does not include these components, navigate to the **File | New Projects** dialog and click the **Open Visual Studio Installer** link.
2222

2323
## See also
2424

‎docs/mfc/reference/cmap-class.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ template<class KEY, class ARG_KEY, class VALUE, class ARG_VALUE>class CMap : pub
2525
`KEY`
2626
Class of the object used as the key to the map.
2727

28-
`ARG` *_* `KEY`
28+
`ARG_KEY`
2929
Data type used for `KEY` arguments; usually a reference to `KEY`.
3030

3131
`VALUE`
3232
Class of the object stored in the map.
3333

34-
`ARG` *_* `VALUE`
34+
`ARG_VALUE`
3535
Data type used for `VALUE` arguments; usually a reference to `VALUE`.
3636

3737
## Members

0 commit comments

Comments
 (0)