Skip to content

Commit af4b75c

Browse files
author
Colin Robertson
authored
Merge pull request #2724 from MicrosoftDocs/FromPublicMasterBranch
Resolve syncing conflicts from FromPublicMasterBranch to master
2 parents f206447 + 3a4a406 commit af4b75c

15 files changed

+37
-34
lines changed

docs/build/cppproperties-schema-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ A configuration may have any of the following properties:
2222
|`forcedInclude`|Header to be automatically included in every compilation unit (maps to /FI for MSVC or -include for clang)|
2323
|`undefines`|The list of macros to be undefined (maps to /U for MSVC)|
2424
|`intelliSenseMode`|The IntelliSense engine to be used. You can specify one of the predefined architecture-specific variants for MSVC, gcc, or Clang.|
25-
|`environments`|User-defined sets of variables that behave like environment variables in a command prompt and are accessed with the ${env.<VARIABLE>} macro.|
25+
|`environments`|User-defined sets of variables that behave like environment variables in a command prompt and are accessed with the ${env.\<VARIABLE>} macro.|
2626

2727
### intelliSenseMode values
2828

docs/cppcx/platform-collections-backinsertiterator-class.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,14 @@ The BackInsertIterator class implements the rules required by the [back_insert_i
5252
**Header:** collection.h
5353

5454
**Namespace:** Platform::Collections
55-
---
55+
5656
## <a name="ctor"></a> BackInsertIterator::BackInsertIterator Constructor
5757

5858
Initializes a new instance of the `BackInsertIterator` class.
5959

6060
## Syntax
6161

6262
```
63-
6463
explicit BackInsertIterator(
6564
Windows::Foundation::Collections::IVector<T>^ v);
6665
```
@@ -118,7 +117,6 @@ Returns a reference to the current BackInsertIterator. The iterator is unmodifie
118117
## Syntax
119118

120119
```
121-
122120
BackInsertIterator& operator++();
123121
124122
BackInsertIterator operator++(int);

docs/data/odbc/data-source-programmatically-configuring-an-odbc-data-source.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ One way to find the keynames and values for the *lpszAttributes* parameter is to
8383

8484
- For 32 bit, find the key **HKEY_CURRENT_USER\Software\ODBC\ODBC.INI\ODBC Data Sources** in the left pane.
8585

86-
The right pane lists entries of the form: "pub: REG_SZ:*<data source name>*", where *<data source name>* is a data source that has already been configured with the desired settings for the driver you intend to use. Select the data source you want, for example, SQL Server. The items following the string "pub:" are, in order, the keyname and value to use in your *lpszAttributes* parameter.
86+
The right pane lists entries of the form: "pub: REG_SZ:*\<data source name>*", where *\<data source name>* is a data source that has already been configured with the desired settings for the driver you intend to use. Select the data source you want, for example, SQL Server. The items following the string "pub:" are, in order, the keyname and value to use in your *lpszAttributes* parameter.
8787

8888
- For 16 bit, find the section in the Odbc.ini file marked by [*\<data source name>*].
8989

docs/dotnet/how-to-wrap-native-class-for-use-by-csharp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.date: "11/04/2016"
55
helpviewer_keywords: ["native code [C++], Visual C# and", "classes [C++], Visual C# and"]
66
ms.assetid: 988819ae-cc6a-4453-8ff5-be369210d962
77
---
8-
# How to: Wrap Native Class for Use by C#
8+
# How to: Wrap Native Class for Use by C\#
99

1010
This sample shows how to wrap a native C++ class so it can be consumed by code authored in C#, or other .NET language.
1111

docs/error-messages/compiler-errors-2/compiler-errors-c3500-through-c3999.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,10 @@ The articles in this section of the documentation explain a subset of the error
466466
|Compiler error C3949|a pack expansion, '...', cannot appear in a parenthesized abstract declarator|
467467
|Compiler error C3950|Obsolete.|
468468
|Compiler error C3951|Cannot use pointer-to-member in projected WinRT type '*type*'. Use a delegate instead.|
469-
|Compiler error C3952|'*type*': WinRT does not support 'in/out' arrays. Use 'const Array<T>^' for 'in' and 'WriteOnlyArray<T>' or 'Array<T>^*' for 'out' on public APIs|
469+
|Compiler error C3952|'*type*': WinRT does not support 'in/out' arrays. Use 'const Array\<T>^' for 'in' and 'WriteOnlyArray\<T>' or 'Array\<T>^*' for 'out' on public APIs|
470470
|Compiler error C3953|Cannot use managed class '*type*' in WinRT module.|
471-
|Compiler error C3954|'*type*': An array returned from a published method on a WinRT type must use the form 'Array<T>^'|
472-
|Compiler error C3955|'*type*': A public constructor cannot contain an 'out' parameter or 'WriteOnlyArray<T>'|
471+
|Compiler error C3954|'*type*': An array returned from a published method on a WinRT type must use the form 'Array\<T>^'|
472+
|Compiler error C3955|'*type*': A public constructor cannot contain an 'out' parameter or 'WriteOnlyArray\<T>'|
473473
|Compiler error C3956|'*type*': Type is marked as Exclusive To '*type*' and cannot be used as a base of '*derived_type*'|
474474
|Compiler error C3957|'*type*': cannot use 'new' on a WinRT type; use 'ref new' instead|
475475
|Compiler error C3958|'*type*': cannot use 'gcnew' on a WinRT type; use 'ref new' instead|

docs/error-messages/compiler-warnings/compiler-warnings-by-compiler-version.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ These warnings and all warnings in later versions are suppressed by using the co
297297
| C4703 | `potentially uninitialized local pointer variable 'name' used` |
298298
| C4728 | `/Yl- option ignored because PCH reference is required` |
299299
| C4745 | `volatile access of 'name' cannot be honored due to its size` |
300-
| C4746|volatile access of 'name' is subject to /volatile:<iso | ms> setting; consider using __iso_volatile_load/store intrinsic functions |
300+
| C4746| `volatile access of 'name' is subject to /volatile:<iso | ms> setting; consider using __iso_volatile_load/store intrinsic functions` |
301301
| C4872 | `floating point division by zero detected when compiling the call graph for the concurrency::parallel_for_each at: 'description'` |
302302
| C4880 | `casting from 'type' to 'type': casting away constness from a pointer or reference may result in undefined behavior in an amp restricted function` |
303303
| C4881 | `the constructor and/or the destructor will not be invoked for tile_static variable 'type'` |

docs/ide/writing-and-refactoring-code-cpp.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ IntelliSense is a powerful code completion tool that suggests symbols and code s
1515

1616
![C&#43;&#43; member list drop down](../ide/media/cpp-statement-completion.png)
1717

18-
Some symbols are omitted automatically to help narrow down the results. For example, when accessing a class objects members from outside the class, you will not be able to see private members by default, or protected members (if you are not in the context of a child class). You can adjust the filtering by using the buttons at the bottom.
18+
Some symbols are omitted automatically to help narrow down the results. For example, when accessing a class object's members from outside the class, you will not be able to see private members by default, or protected members (if you are not in the context of a child class). You can adjust the filtering by using the buttons at the bottom.
1919

20-
After you choose the symbol from the drop-down list, you can autocomplete it with **Tab**, **Enter**, or one of the other commit characters (by default: {}[]().,:;+-*/%&|^!=?@#\). To add or remove characters from this list,
20+
After you choose the symbol from the drop-down list, you can autocomplete it with **Tab**, **Enter**, or one of the other commit characters (by default: `{ } [ ] ( ) . , : ; + - * / % & | ^ ! = ? @ # \`). To add or remove characters from this list,
2121
search for "IntelliSense" in **Quick Launch** (Ctrl + Q) and choose the **Text Editor > C/C++ > Advanced** option. The **Member List Commit Characters** option enables you to customize the list with the changes you want.
2222

2323
The **Member List Filter Mode** option controls what kinds of IntelliSense autocomplete suggestions you see. By default, it is set to **Fuzzy**. In a fuzzy search, if you have a symbol called *MyAwesomeClass*, you can type "MAC" and find the class in your autocomplete suggestions. The fuzzy algorithm sets a minimum threshold that symbols must meet to show up in the list. **Smart** filtering displays all symbols containing substrings that match what you typed. **Prefix** filtering searches for strings that begin with what you typed.
@@ -69,7 +69,7 @@ When the caret is inside a template definition, a **Template Bar** appears, whic
6969

7070
![C&#43;&#43; Template IntelliSense Show Existing Instantiations](../ide/media/template-intellisense-cpp-1.png "Template IntelliSense Show Existing Instantiations")
7171

72-
Click the **<T>** icon to expand/collapse the **Template Bar**. Click the pencil icon or double-click the **Template Bar** to open the **Edit** window.
72+
Click the **\<T>** icon to expand/collapse the **Template Bar**. Click the pencil icon or double-click the **Template Bar** to open the **Edit** window.
7373

7474
![C&#43;&#43; Template IntelliSense](../ide/media/template-intellisense-cpp-3.png "Template IntelliSense")
7575

@@ -182,4 +182,4 @@ Experimental features, which may or may not be included in a future version of V
182182

183183
[Read and understand C++ code](read-and-understand-code-cpp.md)</br>
184184
[Navigate your C++ code base in Visual Studio](navigate-code-cpp.md)</br>
185-
[Collaborate with Live Share for C++](live-share-cpp.md)
185+
[Collaborate with Live Share for C++](live-share-cpp.md)

docs/index.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ title: Visual C++ Documentation
44
description: Learn how to use C++ to develop applications, services, and tools for your platforms and devices.
55
ms.topic: hub-page
66
---
7+
8+
<!-- markdownlint-disable MD033 -->
9+
710
<div id="main" class="v2">
811
<div class="container">
912
<ul class="cardsY panelContent featuredContent">
@@ -54,7 +57,7 @@ ms.topic: hub-page
5457
</div>
5558
</div>
5659
<div class="cardText">
57-
<h3>Whats new for C++ in Visual Studio</h3>
60+
<h3>What's new for C++ in Visual Studio</h3>
5861
</div>
5962
</div>
6063
</div>

docs/linux/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ ms.topic: "landing-page"
99

1010
Use Visual Studio 2017 and later to create and debug applications running on Linux remote machines or Windows Subsystem for Linux.
1111

12+
<!-- markdownlint-disable MD033 -->
13+
1214
<ul class="panelContent cardsF">
1315
<li>
1416
<a href="/cpp/linux/download-install-and-setup-the-linux-development-workload">

docs/overview/cpp-conformance-improvements.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,7 @@ The iterator debugging feature has been taught to properly unwrap `std::move_ite
913913
914914
### Fixes for \<xkeycheck.h> keyword enforcement
915915
916-
The standard librarys macro replacing a keyword enforcement \<xkeycheck.h> was fixed to emit the actual problem keyword detected rather than a generic message. It also supports C++20 keywords, and avoids tricking IntelliSense into saying random keywords are macros.
916+
The standard library's macro replacing a keyword enforcement \<xkeycheck.h> was fixed to emit the actual problem keyword detected rather than a generic message. It also supports C++20 keywords, and avoids tricking IntelliSense into saying random keywords are macros.
917917
918918
### Allocator types no longer deprecated
919919
@@ -925,7 +925,7 @@ A spurious `static_cast` not called for by the standard that accidentally suppre
925925
926926
### Various \<filesystem> correctness fixes
927927
928-
- Fixed `std::filesystem::last_write_time` failing when attempting to change a directorys last write time.
928+
- Fixed `std::filesystem::last_write_time` failing when attempting to change a directory's last write time.
929929
- The `std::filesystem::directory_entry` constructor now stores a failed result, rather than throwing an exception, when supplied a nonexistent target path.
930930
- The `std::filesystem::create_directory` 2-parameter version was changed to call the 1-parameter version, as the underlying `CreateDirectoryExW` function would use `copy_symlink` when the `existing_p` was a symlink.
931931
- `std::filesystem::directory_iterator` no longer fails when a broken symlink is found.
@@ -963,7 +963,7 @@ The unordered container `reserve` function now actually reserves for N elements,
963963
964964
- Many standard library internal container functions have been made private for an improved IntelliSense experience. Additional fixes to mark members as private are expected in later releases of MSVC.
965965
966-
- Exception safety correctness problems wherein the node-based containers like `list`, `map`, and `unordered_map` would become corrupted were fixed. During a `propagate_on_container_copy_assignment` or `propagate_on_container_move_assignment` reassignment operation, we would free the containers sentinel node with the old allocator, do the POCCA/POCMA assignment over the old allocator, and then try to acquire the sentinel node from the new allocator. If this allocation failed, the container was corrupted and couldnt even be destroyed, as owning a sentinel node is a hard data structure invariant. This code was fixed to allocate the new sentinel node from the source containers allocator before destroying the existing sentinel node.
966+
- Exception safety correctness problems wherein the node-based containers like `list`, `map`, and `unordered_map` would become corrupted were fixed. During a `propagate_on_container_copy_assignment` or `propagate_on_container_move_assignment` reassignment operation, we would free the container's sentinel node with the old allocator, do the POCCA/POCMA assignment over the old allocator, and then try to acquire the sentinel node from the new allocator. If this allocation failed, the container was corrupted and couldn't even be destroyed, as owning a sentinel node is a hard data structure invariant. This code was fixed to allocate the new sentinel node from the source container's allocator before destroying the existing sentinel node.
967967
968968
- The containers were fixed to always copy/move/swap allocators according to `propagate_on_container_copy_assignment`, `propagate_on_container_move_assignment`, and `propagate_on_container_swap`, even for allocators declared `is_always_equal`.
969969
@@ -2841,7 +2841,7 @@ int main()
28412841
28422842
In [/permissive-](../build/reference/permissive-standards-conformance.md) mode, the compiler now requires the **template** keyword to precede a template-name when it comes after a dependent nested-name-specifier.
28432843
2844-
The following code in [/permissive-](../build/reference/permissive-standards-conformance.md) mode now raises C7510: *'example': use of dependent template name must be prefixed with 'template'. note: see reference to class template instantiation 'X<T>' being compiled*:
2844+
The following code in [/permissive-](../build/reference/permissive-standards-conformance.md) mode now raises C7510: *'example': use of dependent template name must be prefixed with 'template'. note: see reference to class template instantiation 'X\<T>' being compiled*:
28452845
28462846
```cpp
28472847
template<typename T> struct Base

0 commit comments

Comments
 (0)