Skip to content

Commit 7d15629

Browse files
TylerMSFTTylerMSFT
authored andcommitted
acrolinx
1 parent 1f2736e commit 7d15629

File tree

4 files changed

+132
-132
lines changed

4 files changed

+132
-132
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ These macros control specific compiler features.
1414
|[`_ATL_ALL_WARNINGS`](#_atl_all_warnings)|A symbol that enables errors in projects converted from previous versions of ATL.|
1515
|[`_ATL_APARTMENT_THREADED`](#_atl_apartment_threaded)|Define if one or more of your objects use apartment threading.|
1616
|[`_ATL_CSTRING_EXPLICIT_CONSTRUCTORS`](#_atl_cstring_explicit_constructors)|Makes certain `CString` constructors explicit, preventing any unintentional conversions.|
17-
|[`_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.|
17+
|[`_ATL_ENABLE_PTM_WARNING`](#_atl_enable_ptm_warning)|Define this macro to require C++ standard syntax. It generates the C4867 compiler error when nonstandard 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).|
2020
|[`_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.|
@@ -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+
```cpp
6868
_ATL_APARTMENT_THREADED
6969
```
7070

@@ -88,7 +88,7 @@ By using the `_T` macro on all constructor string arguments, you can define `_AT
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 causes 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 nonstandard syntax is used to initialize a pointer to a member function.
9292

9393
```cpp
9494
#define _ATL_ENABLE_PTM_WARNING
@@ -100,7 +100,7 @@ The ATL and MFC libraries have been changed to match the Microsoft C++ compiler'
100100

101101
When [`_ATL_ENABLE_PTM_WARNING`](#_atl_enable_ptm_warning) isn't defined (the default case), ATL/MFC disables the C4867 error in macro maps (notably message maps) so that code that was created in earlier versions can continue to build as before. If you define `_ATL_ENABLE_PTM_WARNING`, your code should conform to the C++ standard.
102102

103-
However, the non-standard form has been deprecated. You need to move existing code to C++ standard syntax. For example, the following code:
103+
However, the nonstandard form has been deprecated. You need to move existing code to C++ standard syntax. For example, the following code:
104104

105105
[!code-cpp[NVC_MFCListView#14](../../atl/reference/codesnippet/cpp/compiler-options-macros_2.cpp)]
106106

@@ -132,7 +132,7 @@ _ATL_MODULES
132132

133133
## <a name="_atl_multi_threaded"></a> `_ATL_MULTI_THREADED`
134134

135-
A symbol that indicates the project will have objects that are marked as Both, Free or Neutral.
135+
A symbol that indicates the project has objects that are marked as Both, Free or Neutral.
136136

137137
```
138138
_ATL_MULTI_THREADED
@@ -193,11 +193,11 @@ A symbol that indicates a function shouldn't be inlined.
193193
### Parameters
194194

195195
*`myfunction`*\
196-
The function that should not be inlined.
196+
The function that shouldn't be inlined.
197197

198198
### Remarks
199199

200-
Use this symbol if you want to ensure a function does not get inlined by the compiler, even though it must be declared as inline so that it can be placed in a header file. Expands to `__declspec(noinline)`.
200+
Use this symbol if you want to ensure a function doesn't get inlined by the compiler, even though it must be declared as inline so that it can be placed in a header file. Expands to `__declspec(noinline)`.
201201

202202
## <a name="_atl_single_threaded"></a> `_ATL_SINGLE_THREADED`
203203

docs/cpp/cpp-bit-fields.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The conceptual memory layout of an object of type `Date` is shown in the followi
3838
32 bits of memory are displayed in a row. Starting with the least significant bit, 3 bits are for nWeekDay. The next 6 bits are for nMonthDay. The next 5 bits are for nMonth. The next 2 bits are unused. The next 8 bits are for nYear. The remaining 8 bits are unused.
3939
:::image-end:::
4040
41-
`nYear` is 8 bits long which would overflow the word boundary of the declared type, **`unsigned short`**. Therefore, it starts at the beginning of a new **`unsigned short`**. It isn't necessary that all bit fields fit in one object of the underlying type; new units of storage are allocated, according to the number of bits requested in the declaration.
41+
`nYear` is 8 bits long, which would overflow the word boundary of the declared type, **`unsigned short`**. Therefore, it starts at the beginning of a new **`unsigned short`**. It isn't necessary that all bit fields fit in one object of the underlying type; new units of storage are allocated, according to the number of bits requested in the declaration.
4242
4343
**Microsoft Specific**
4444

docs/cpp/dynamic-cast-operator.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ void f() {
138138
Further ambiguities can be introduced when you use virtual base classes. Consider the class hierarchy shown in the following figure.
139139
140140
:::image type="complex" source="../cpp/media/vc39012.gif" alt-text="Class hierarchy that shows virtual base classes.":::
141-
The diagram shows the classes A, B, C, D, and E arranged as follows: Class A is a base class of B. Classes C and E each derive from B. Class E also inherits from D, which inherits from class B which in turn inherits from class A.
141+
The diagram shows the classes A, B, C, D, and E arranged as follows: Class A is a base class of B. Classes C and E each derive from B. Class E also inherits from D, which inherits from class B, which inherits from class A.
142142
:::image-end:::
143143
Class hierarchy that shows virtual base classes
144144
@@ -147,7 +147,7 @@ In this hierarchy, `A` is a virtual base class. Given an instance of class `E` a
147147
Consider the class hierarchy shown in the following figure.
148148
149149
:::image type="complex" source="../cpp/media/vc39013.gif" alt-text="Class hierarchy that shows duplicate base classes.":::
150-
The diagram shows the classes A, B, C, D, and E arranged as follows: Class B derives from Class A. Class C derives from class A. class D derives from class B. Class E derives from class C which derives from class A. In this case, the duplicate base class is class A, which is directly or indirectly inherited by all the other classes. Class A is inherited directly by classes B and C, and indirectly by class D via class B, and indirectly by class E via class C, and indirectly in class D via class B.
150+
The diagram shows the classes A, B, C, D, and E arranged as follows: Class B derives from Class A. Class C derives from class A. class D derives from class B. Class E derives from class C, which derives from class A. In this case, the duplicate base class is class A, which is directly or indirectly inherited by all the other classes. Class A is inherited directly by classes B and C, and indirectly by class D via class B, and indirectly by class E via class C, and indirectly in class D via class B.
151151
:::image-end:::
152152
Class hierarchy that shows duplicate base classes
153153

0 commit comments

Comments
 (0)