Skip to content

Commit f408b1a

Browse files
TylerMSFTTylerMSFT
authored andcommitted
acrolinx
1 parent c988a20 commit f408b1a

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

docs/atl/reference/compiler-options-macros.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ These macros control specific compiler features.
1717
|[`_ATL_ENABLE_PTM_WARNING`](#_atl_enable_ptm_warning)|Define this macro to require C++ standard syntax. It generates the C4867 compiler error when non-standard syntax is used to initialize a pointer to a member function.|
1818
|[`_ATL_FREE_THREADED`](#_atl_free_threaded)|Define if one or more of your objects use free or neutral threading.|
1919
|[`_ATL_MODULES`](#_ATL_MODULES)|Allows you to compile ATL projects with [permissive-](../../build/reference/permissive-standards-conformance.md) and use ATL with [C++ modules](../../cpp/modules-cpp.md).|
20-
|[`_ATL_MULTI_THREADED`](#_atl_multi_threaded)|A symbol that indicates the project will have objects that are marked as Both, Free or Neutral. The macro [`_ATL_FREE_THREADED`](#_atl_free_threaded) should be used instead.|
20+
|[`_ATL_MULTI_THREADED`](#_atl_multi_threaded)|A symbol that indicates the project has objects marked as Both, Free or Neutral. The macro [`_ATL_FREE_THREADED`](#_atl_free_threaded) should be used instead.|
2121
|[`_ATL_NO_AUTOMATIC_NAMESPACE`](#_atl_no_automatic_namespace)|A symbol that prevents the default use of namespace as ATL.|
2222
|[`_ATL_NO_COM_SUPPORT`](#_atl_no_com_support)|A symbol that prevents COM-related code from being compiled with your project.|
2323
|[`ATL_NO_VTABLE`](#atl_no_vtable)|A symbol that prevents the vtable pointer from being initialized in the class's constructor and destructor.|
@@ -28,7 +28,7 @@ These macros control specific compiler features.
2828

2929
A symbol that enables errors in projects converted from previous versions of ATL.
3030

31-
```
31+
```cpp
3232
#define _ATL_ALL_WARNINGS
3333
```
3434

@@ -52,7 +52,7 @@ Before Visual C++ .NET 2002, ATL disabled many warnings and left them disabled s
5252

5353
In projects converted from previous versions, these warnings are still disabled by the libraries headers.
5454

55-
By adding the following line to the *pch.h* (*stdafx.h* in Visual Studio 2017 and earlier) file before including libraries headers, this behavior can be changed.
55+
To change this behavior, add the following line to the *`pch.h`* (*`stdafx.h`* in Visual Studio 2017 and earlier) file before including libraries headers.
5656

5757
[!code-cpp[NVC_ATL_Utilities#97](../../atl/codesnippet/cpp/compiler-options-macros_1.h)]
5858

@@ -64,7 +64,7 @@ New projects have this `#define` set in *pch.h* (*stdafx.h* in Visual Studio 201
6464

6565
Define if one or more of your objects use apartment threading.
6666

67-
```
67+
```c
6868
_ATL_APARTMENT_THREADED
6969
```
7070

@@ -76,19 +76,19 @@ Specifies apartment threading. For other options, and a description of the thre
7676

7777
Makes certain `CString` constructors explicit, preventing any unintentional conversions.
7878

79-
```cpp
79+
```
8080
_ATL_CSTRING_EXPLICIT_CONSTRUCTORS
8181
```
8282

8383
### Remarks
8484

85-
When this constructor is defined, all CString constructors that take a single parameter are compiled with the explicit keyword, which prevents implicit conversions of input arguments. This means, for example, that when _UNICODE is defined, if you attempt to use a char* string as a CString constructor argument, a compiler error will result. Use this macro in situations where you need to prevent implicit conversions between narrow and wide string types.
85+
When this constructor is defined, all `CString` constructors that take a single parameter are compiled with the explicit keyword, which prevents implicit conversions of input arguments. This means, for example, that when `_UNICODE` is defined, if you attempt to use a `char*` string as a `CString` constructor argument, a compiler error results. Use this macro in situations where you need to prevent implicit conversions between narrow and wide string types.
8686

8787
By using the `_T` macro on all constructor string arguments, you can define `_ATL_CSTRING_EXPLICIT_CONSTRUCTORS` and avoid compile errors regardless of whether `_UNICODE` is defined.
8888

8989
## <a name="_atl_enable_ptm_warning"></a> `_ATL_ENABLE_PTM_WARNING`
9090

91-
Define this macro in order to force the use of ANSI C++ standard-conforming syntax for pointer to member functions. Using this macro will cause the C4867 compiler error to be generated when non-standard syntax is used to initialize a pointer to a member function.
91+
Define this macro in order to force the use of ANSI C++ standard-conforming syntax for pointer to member functions. Using this macro causes the C4867 compiler error to be generated when non-standard syntax is used to initialize a pointer to a member function.
9292

9393
```cpp
9494
#define _ATL_ENABLE_PTM_WARNING
@@ -140,7 +140,7 @@ _ATL_MULTI_THREADED
140140

141141
### Remarks
142142

143-
If this symbol is defined, ATL will pull in code that will correctly synchronize access to global data. New code should use the equivalent macro [`_ATL_FREE_THREADED`](#_atl_free_threaded) instead.
143+
If this symbol is defined, ATL pulls in code that will correctly synchronize access to global data. New code should use the equivalent macro [`_ATL_FREE_THREADED`](#_atl_free_threaded) instead.
144144

145145
## <a name="_atl_no_automatic_namespace"></a> `_ATL_NO_AUTOMATIC_NAMESPACE`
146146

@@ -152,7 +152,7 @@ _ATL_NO_AUTOMATIC_NAMESPACE
152152

153153
### Remarks
154154

155-
If this symbol isn't defined, including `atlbase.h` will perform `using namespace ATL` by default, which may lead to naming conflicts. To prevent this, define this symbol.
155+
If this symbol isn't defined, including `atlbase.h` performs `using namespace ATL` by default, which may lead to naming conflicts. To prevent this, define this symbol.
156156

157157
## <a name="_atl_no_com_support"></a> `_ATL_NO_COM_SUPPORT`
158158

docs/build/cmake-presets-vs.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ On the Visual Studio toolbar, there are dropdowns for the Target Systems, Config
127127
The dropdown list on the left indicates the active *Target System*. It's the system on which CMake is invoked to configure and build the project. This dropdown list includes your local machine, all SSH connections in Connection Manager by host name, and all Windows Subsystem for Linux (WSL) installations that Visual Studio can find:
128128

129129
:::image type="complex" source="./media/target-system-selections.png" alt-text="Screenshot of the Target System dropdown list":::
130-
The dropdown lists contains several entries including: Local Machine, an ip address 192.168.0.5, WSL: ubuntu2004, WSL: debian, and Manage Connections.:::image-end:::
130+
The dropdown lists contains several entries including Local Machine, an ip address 192.168.0.5, WSL: ubuntu2004, WSL: debian, and Manage Connections.
131+
:::image-end:::
131132

132133
In the preceding example:
133134

@@ -483,8 +484,8 @@ The *`CMakePresets.json`* file in [box2d-lite](https://github.com/esweet431/box2
483484
Learn more about configuring and debugging CMake projects in Visual Studio:
484485

485486
> [!div class="nextstepaction"]
486-
> [CMake Projects in Visual Studio](cmake-projects-in-visual-studio.md)<br/><br/>
487-
> [Customize CMake build settings](customize-cmake-settings.md)<br/><br/>
488-
> [Configure CMake debugging sessions](configure-cmake-debugging-sessions.md)<br/><br/>
487+
> [CMake Projects in Visual Studio](cmake-projects-in-visual-studio.md)\
488+
> [Customize CMake build settings](customize-cmake-settings.md)\
489+
> [Configure CMake debugging sessions](configure-cmake-debugging-sessions.md)\
489490
> [CMake predefined configuration reference](cmake-predefined-configuration-reference.md)
490491
>

0 commit comments

Comments
 (0)