Skip to content

Commit d8b7567

Browse files
openpublishbuildColin Robertson
openpublishbuild
authored and
Colin Robertson
committed
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master) (MicrosoftDocs#343)
* merge to live (#341) * Add _chkstk to list of internals * Fixes for command line issues * Minor tweak * Update random.md (#322) Fix broken fwlink to presentation on rand * Update link names and instructions * More link fixes, consolidation * Another tweak * Update x64 topics, topic names * Fix C3861 issues. * Fix link issues. * Dang typoes. * Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master) (MicrosoftDocs#323) * Update random.md Fix broken fwlink to presentation on rand * Update arm-assembler-reference.md Point to search engine to pick up latest results for ARM references on the ARM Developer Center. * Update some egregious out-of-dateness * Fix a link typo. * Update to address user complaints * Minor tweaks. * Remove stray parens. * updated info on mbcs dll (MicrosoftDocs#325) * Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master) (MicrosoftDocs#326) * Update random.md Fix broken fwlink to presentation on rand * Update arm-assembler-reference.md Point to search engine to pick up latest results for ARM references on the ARM Developer Center. * Update desktop-applications-visual-cpp.md Fix space issue * Fix some C1083 user complaints (MicrosoftDocs#332) * First draft of fixes for user complaints * More updates for common issues * More consistency tweaks * Fix link typo * Make C2065 friendlier (#333) * Try to address some user issues. * Add a useful link. * Updated namespaces topic (#329) * updated namespaces topic * udpated ms.date * Updated content on MFC MBCS DLL (MicrosoftDocs#328) * updated info on mbcs dll * minor tweak * udpated ms.date * Update ms.date to match changes. * Update more freshness dates * Escape brackets, fix format * Update .openpublishing.publish.config.json with pdf info (#336) * Update .openpublishing.publish.config.json * Update .openpublishing.publish.config.json * Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master) (#335) * Update random.md Fix broken fwlink to presentation on rand * Update arm-assembler-reference.md Point to search engine to pick up latest results for ARM references on the ARM Developer Center. * Update desktop-applications-visual-cpp.md Fix space issue * 📦 Enable PDF generation. * zc-conformance.md: rvalueCast is off by default rvalueCast is off by default according to the https://docs.microsoft.com/en-us/cpp/build/reference/zc-rvaluecast-enforce-type-conversion-rules * Fix bad merge in storage-classes-cpp Had merge conflict markers * Update .openpublishing.publish.config.json * Fix typographical error The fix is for the file docs/windows/desktop-applications-visual-cpp.md and adds the missing word "that" to a sentence. * Correct .ERRDIF[[I]] title * Fixed indentation * Replace nonsense with correct statement Replace nonsense with correct statement * Update read.md Fix some more formatting while we're at it. * Correct build working directory * Order link option alphabetically Orders link option CLRUNMANAGEDCODECHECK alphabetically in the table of contents for consistency. * Updating timestamp Worth getting this right, since otherwise it doesn't look like this page covers 15.3 (and it does!) * Update cl-environment-variables.md Line 65, fixed spelling of "setting". * Update CONTRIBUTING.md * Resolve syncing conflicts from FromPublicMasterBranch to master (#340) * Update random.md Fix broken fwlink to presentation on rand * Update arm-assembler-reference.md Point to search engine to pick up latest results for ARM references on the ARM Developer Center. * Update desktop-applications-visual-cpp.md Fix space issue * 📦 Enable PDF generation. * zc-conformance.md: rvalueCast is off by default rvalueCast is off by default according to the https://docs.microsoft.com/en-us/cpp/build/reference/zc-rvaluecast-enforce-type-conversion-rules * Fix bad merge in storage-classes-cpp Had merge conflict markers * Update .openpublishing.publish.config.json * Fix typographical error The fix is for the file docs/windows/desktop-applications-visual-cpp.md and adds the missing word "that" to a sentence. * Correct .ERRDIF[[I]] title * Fixed indentation * Replace nonsense with correct statement Replace nonsense with correct statement * Update read.md Fix some more formatting while we're at it. * Correct build working directory * Order link option alphabetically Orders link option CLRUNMANAGEDCODECHECK alphabetically in the table of contents for consistency. * Updating timestamp Worth getting this right, since otherwise it doesn't look like this page covers 15.3 (and it does!) * Update cl-environment-variables.md Line 65, fixed spelling of "setting". * Update CONTRIBUTING.md * Update filesystem-enumerations.md Fix for minor grammatical issue * Correct unnecessary '\<' escape The markdown processor changed a couple of sprints ago, and '<' escaping is no longer required in backtick code literals, and also generates incorrect backslash iont he viewed content * remove spurious text from code examples * Format C++ samples as cpp. - Also use headers to separate sample output, instead of unsupported "Output" syntax * Apply cpp to code samples so they are syntax highlighted - also consistent usage of bold/code * Apply cpp to code samples for syntax highlighting * Add missing 'cpp' for C++ code blocks * Portable escape syntax for asterisk, add cpp to code samples - Different md processors handle character escapes differently. In particular, the OPS markdown processor is in some places different than the GitHub/VSTS/etc previewers. A recent sprint changed the markdown processor, so this topic doesn't render the escaped asterisks properly. Changed these to use html character references, which render properly in all processors/viewers. - add cpp to c++ code samples * add cpp to C++ code samples, md lint headers markdown lint says to use blank lines around headers * use cpp in c++ code samples so they get highlighted * Use cpp for C++ code samples * Use cpp for C++ code samples * use cpp for C++ code samples * cpp for c++ code samples, edits - Use cpp for c++ code examples so they get syntax highlighting - Edit for correct standard MS notation for `code literal`, **keyword**. - Make headings parallel and aligned with the defined terms wrt the inclusion/explicit instantiation models * Update template-friends.md Undo output tag change - this should be a global change if we decide to make it. * Update partial-ordering-of-function-templates-cpp.md Updated escapes to switch ** to __. Babelmark 2 https://johnmacfarlane.net/babelmark2/ seems to find these changes acceptable. Cleaned a little formatting.
1 parent 39a215b commit d8b7567

14 files changed

Lines changed: 184 additions & 151 deletions

‎docs/cpp/class-templates.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ This topic describes rules that are specific to C++ class templates.
2323
Member functions can be defined inside or outside of a class template. They are defined like function templates if defined outside the class template.
2424

2525
```cpp
26-
Copy Code
2726
// member_function_templates1.cpp
2827
template<class T, int i> class MyStack
2928
{
@@ -190,8 +189,7 @@ X<T>::Y<U>::Y()
190189
10
191190
99
192191
X<T>::Y<U>::~Y()
193-
X<T>::Y<U>::~Y()
194-
192+
X<T>::Y<U>::~Y()
195193
```
196194

197195
Local classes are not allowed to have member templates.
@@ -440,4 +438,4 @@ int main()
440438
```
441439

442440
## See Also
443-
[Templates](../cpp/templates-cpp.md)
441+
[Templates](../cpp/templates-cpp.md)

‎docs/cpp/containers-modern-cpp.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ translation.priority.mt: ["cs-cz", "pl-pl", "pt-br", "tr-tr"]
1818
---
1919
# Containers (Modern C++)
2020

21-
By default, use [vector](../standard-library/vector-class.md) as the preferred sequential container in C++. This is equivalent to `List\<T>` in .NET languages.
21+
By default, use [vector](../standard-library/vector-class.md) as the preferred sequential container in C++. This is equivalent to `List<T>` in .NET languages.
2222

2323
```cpp
2424
vector<string> apples;
@@ -48,4 +48,4 @@ For more information about containers, see [C++ Standard Library Containers](../
4848
## See Also
4949
[Welcome Back to C++](../cpp/welcome-back-to-cpp-modern-cpp.md)
5050
[C++ Language Reference](../cpp/cpp-language-reference.md)
51-
[C++ Standard Library](../standard-library/cpp-standard-library-reference.md)
51+
[C++ Standard Library](../standard-library/cpp-standard-library-reference.md)

‎docs/cpp/explicit-specialization-of-function-templates.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ translation.priority.ht: ["cs-cz", "de-de", "es-es", "fr-fr", "it-it", "ja-jp",
1919
# Explicit Specialization of Function Templates
2020
With a function template, you can define special behavior for a specific type by providing an explicit specialization (override) of the function template for that type. For example:
2121

22-
```
22+
```cpp
2323
template<> void MySwap(double a, double b);
2424
```
2525
2626
This declaration enables you to define a different function for **double** variables. Like non-template functions, standard type conversions (such as promoting a variable of type **float** to **double**) are applied.
2727
2828
## Example
2929
30-
```
30+
```cpp
3131
// explicit_specialization.cpp
3232
template<class T> void f(T t)
3333
{
@@ -52,4 +52,4 @@ int main()
5252
```
5353

5454
## See Also
55-
[Function Templates](../cpp/function-templates.md)
55+
[Function Templates](../cpp/function-templates.md)

‎docs/cpp/function-template-instantiation.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ When a function template is first called for each type, the compiler creates an
2323

2424
Function templates can be explicitly instantiated by declaring the template with a particular type as an argument. For example, the following code is allowed:
2525

26-
```
26+
```cpp
2727
// function_template_instantiation.cpp
2828
template<class T> void f(T) { }
2929

@@ -40,4 +40,4 @@ int main()
4040
```
4141
4242
## See Also
43-
[Function Templates](../cpp/function-templates.md)
43+
[Function Templates](../cpp/function-templates.md)

‎docs/cpp/function-templates.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ translation.priority.ht: ["cs-cz", "de-de", "es-es", "fr-fr", "it-it", "ja-jp",
1919
# Function Templates
2020
Class templates define a family of related classes that are based on the type arguments passed to the class upon instantiation. Function templates are similar to class templates but define a family of functions. With function templates, you can specify a set of functions that are based on the same code but act on different types or classes. The following function template swaps two items:
2121

22-
```
22+
```cpp
2323
// function_templates1.cpp
2424
template< class T > void MySwap( T& a, T& b ) {
2525
T c(a);
@@ -30,13 +30,13 @@ int main() {
3030
}
3131
```
3232
33-
This code defines a family of functions that swap the values of the arguments. From this template, you can generate functions that will swap `int` and **long** types and also user-defined types. `MySwap` will even swap classes if the class's copy constructor and assignment operator are properly defined.
33+
This code defines a family of functions that swap the values of the arguments. From this template, you can generate functions that will swap **int** and **long** types and also user-defined types. `MySwap` will even swap classes if the class's copy constructor and assignment operator are properly defined.
3434
3535
In addition, the function template will prevent you from swapping objects of different types, because the compiler knows the types of the `a` and `b` parameters at compile time.
3636
3737
Although this function could be performed by a nontemplated function, using void pointers, the template version is typesafe. Consider the following calls:
3838
39-
```
39+
```cpp
4040
int j = 10;
4141
int k = 18;
4242
CString Hello = "Hello, Windows!";
@@ -48,7 +48,7 @@ MySwap( j, Hello ); //error
4848

4949
Explicit specification of the template arguments for a function template is allowed. For example:
5050

51-
```
51+
```cpp
5252
// function_templates2.cpp
5353
template<class T> void f(T) {}
5454
int main(int j) {
@@ -57,10 +57,10 @@ int main(int j) {
5757
}
5858
```
5959
60-
When the template argument is explicitly specified, normal implicit conversions are done to convert the function argument to the type of the corresponding function template parameters. In the above example, the compiler will convert (`char j`) to type `int`.
60+
When the template argument is explicitly specified, normal implicit conversions are done to convert the function argument to the type of the corresponding function template parameters. In the above example, the compiler will convert `char j` to type `int`.
6161
6262
## See Also
6363
[Templates](../cpp/templates-cpp.md)
6464
[Function Template Instantiation](../cpp/function-template-instantiation.md)
6565
[Explicit Instantiation](../cpp/explicit-instantiation.md)
66-
[Explicit Specialization of Function Templates](../cpp/explicit-specialization-of-function-templates.md)
66+
[Explicit Specialization of Function Templates](../cpp/explicit-specialization-of-function-templates.md)

‎docs/cpp/member-function-templates.md‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,16 @@ manager: "ghogen"
1717
translation.priority.ht: ["cs-cz", "de-de", "es-es", "fr-fr", "it-it", "ja-jp", "ko-kr", "pl-pl", "pt-br", "ru-ru", "tr-tr", "zh-cn", "zh-tw"]
1818
---
1919
# Member Function Templates
20+
2021
The term member template refers to both member function templates and nested class templates. Member function templates are template functions that are members of a class or class template.
2122

2223
Member functions can be function templates in several contexts. All functions of class templates are generic but are not referred to as member templates or member function templates. If these member functions take their own template arguments, they are considered to be member function templates.
2324

24-
## Example
25+
## Example
26+
2527
Member function templates of nontemplate or template classes are declared as function templates with their template parameters.
2628

27-
```
29+
```cpp
2830
// member_function_templates.cpp
2931
struct X
3032
{
@@ -39,10 +41,11 @@ int main()
3941
}
4042
```
4143

42-
## Example
44+
## Example
45+
4346
The following example shows a member function template of a template class.
4447

45-
```
48+
```cpp
4649
// member_function_templates2.cpp
4750
template<typename T>
4851
class X
@@ -59,10 +62,11 @@ int main()
5962
}
6063
```
6164

62-
## Example
65+
## Example
66+
6367
Additionally, in Visual Studio .NET 2003 and later, member templates can also be defined outside of a class.
6468

65-
```
69+
```cpp
6670
// defining_member_templates_outside_class.cpp
6771
template<typename T>
6872
class X
@@ -82,14 +86,15 @@ int main()
8286
}
8387
```
8488

85-
## Example
89+
## Example
90+
8691
Local classes are not allowed to have member templates.
8792

8893
Member template functions cannot be virtual functions and cannot override virtual functions from a base class when they are declared with the same name as a base class virtual function.
8994

9095
Visual C++ .NET 2003 introduced support for templated user-defined conversions. The following sample works in Visual C++ .NET 2003 as specified in the standard.
9196

92-
```
97+
```cpp
9398
// templated_user_defined_conversions.cpp
9499
template <class T>
95100
struct S
@@ -107,5 +112,6 @@ int main()
107112
}
108113
```
109114

110-
## See Also
111-
[Function Templates](../cpp/function-templates.md)
115+
## See Also
116+
117+
[Function Templates](../cpp/function-templates.md)

‎docs/cpp/name-resolution-for-locally-declared-names.md‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ manager: "ghogen"
1616
translation.priority.ht: ["cs-cz", "de-de", "es-es", "fr-fr", "it-it", "ja-jp", "ko-kr", "pl-pl", "pt-br", "ru-ru", "tr-tr", "zh-cn", "zh-tw"]
1717
---
1818
# Name Resolution for Locally Declared Names
19+
1920
The template's name itself can be referred to with or without the template arguments. In the scope of a class template, the name itself refers to the template. In the scope of a template specialization or partial specialization, the name alone refers to the specialization or partial specialization. Other specializations or partial specializations of the template can also be referenced, with the appropriate template arguments.
2021

21-
## Example
22+
## Example
23+
2224
The following code shows that the class template's name A is interpreted differently in the scope of a specialization or partial specialization.
2325

24-
```
26+
```cpp
2527
// template_name_resolution3.cpp
2628
// compile with: /c
2729
template <class T> class A {
@@ -39,12 +41,13 @@ template<> class A<int> {
3941
};
4042
```
4143
42-
## Example
44+
## Example
45+
4346
In the case of a name conflict between a template parameter and another object, the template parameter can or cannot be hidden. The following rules will help determine precedence.
4447
4548
The template parameter is in scope from the point where it first appears until the end of the class or function template. If the name appears again in the template argument list or in the list of base classes, it refers to the same type. In standard C++, no other name that is identical to the template parameter can be declared in the same scope. A Microsoft extension allows the template parameter to be redefined in the scope of the template. The following example shows using the template parameter in the base specification of a class template.
4649
47-
```
50+
```cpp
4851
// template_name_resolution4.cpp
4952
// compile with: /EHsc
5053
template <class T>
@@ -58,10 +61,11 @@ int main() {
5861
}
5962
```
6063

61-
## Example
64+
## Example
65+
6266
When defining a template's member functions outside the class template, a different template parameter name can be used. If the template member function definition uses a different name for the template parameter than the declaration does, and the name used in the definition conflicts with another member of the declaration, the member in the template declaration takes precedence.
6367

64-
```
68+
```cpp
6569
// template_name_resolution5.cpp
6670
// compile with: /EHsc
6771
#include <iostream>
@@ -92,10 +96,11 @@ int main() {
9296
Z::Z()
9397
```
9498

95-
## Example
99+
## Example
100+
96101
When defining a template function or member function outside the namespace in which the template was declared, the template argument takes precedence over the names of other members of the namespace.
97102

98-
```
103+
```cpp
99104
// template_name_resolution6.cpp
100105
// compile with: /EHsc
101106
#include <iostream>
@@ -125,10 +130,11 @@ int main() {
125130
C<T>::g
126131
```
127132

128-
## Example
133+
## Example
134+
129135
In definitions that are outside of the template class declaration, if a template class has a base class that does not depend on a template argument and if the base class or one of its members has the same name as a template argument, then the base class or member name hides the template argument.
130136

131-
```
137+
```cpp
132138
// template_name_resolution7.cpp
133139
// compile with: /EHsc
134140
#include <iostream>
@@ -162,5 +168,6 @@ Base
162168
1
163169
```
164170

165-
## See Also
166-
[Name Resolution](../cpp/templates-and-name-resolution.md)
171+
## See Also
172+
173+
[Name Resolution](../cpp/templates-and-name-resolution.md)

‎docs/cpp/overload-resolution-of-function-template-calls.md‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ translation.priority.ht: ["cs-cz", "de-de", "es-es", "fr-fr", "it-it", "ja-jp",
1919
# Overload Resolution of Function Template Calls
2020
A function template can overload nontemplate functions of the same name. In this scenario, function calls are resolved by first using template argument deduction to instantiate the function template with a unique specialization. If template argument deduction fails, the other function overloads are considered to resolve the call. These other overloads, also known as the candidate set, include nontemplate functions and other instantiated function templates. If template argument deduction succeeds, then the generated function is compared with the other functions to determine the best match, following the rules for overload resolution. For more information, see [Function Overloading](function-overloading.md).
2121

22-
## Example
22+
## Example
23+
2324
If a nontemplate function is an equally good match to a template function, the nontemplate function is chosen (unless the template arguments were explicitly specified), as in the call `f(1, 1)` in the following example.
2425

25-
```
26+
```cpp
2627
// template_name_resolution9.cpp
2728
// compile with: /EHsc
2829
#include <iostream>
@@ -51,10 +52,11 @@ void f(T1, T2)
5152
void f(T1, T2)
5253
```
5354

54-
## Example
55+
## Example
56+
5557
The next example illustrates that the exactly matching template function is preferred if the nontemplate function requires a conversion.
5658

57-
```
59+
```cpp
5860
// template_name_resolution10.cpp
5961
// compile with: /EHsc
6062
#include <iostream>
@@ -82,7 +84,8 @@ int main()
8284
void f(T1, T2)
8385
```
8486

85-
## See Also
87+
## See Also
88+
8689
[Name Resolution](../cpp/templates-and-name-resolution.md)
8790
[typename](../cpp/typename.md)
88-
91+

0 commit comments

Comments
 (0)