Skip to content

Commit 34d2e1a

Browse files
author
Colin Robertson
authored
Merge branch 'master' into cr-formatspec
2 parents 3a82adf + 5a6e81d commit 34d2e1a

File tree

385 files changed

+1828
-9362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

385 files changed

+1828
-9362
lines changed

‎docs/assembler/masm/assume.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.suite: ""
77
ms.technology: ["cpp-tools"]
88
ms.tgt_pltfrm: ""
99
ms.topic: "article"
10-
f1_keywords: ["ASSUME", "_assume_cpp"]
10+
f1_keywords: ["ASSUME"]
1111
dev_langs: ["C++"]
1212
helpviewer_keywords: ["ASSUME directive"]
1313
ms.assetid: cd162070-aee9-4c65-babc-005c6cc73d7c
@@ -22,8 +22,7 @@ Enables error checking for register values.
2222
## Syntax
2323

2424
```
25-
26-
ASSUME segregister:name [[, segregister:name]]...
25+
ASSUME segregister:name [[, segregister:name]]...
2726
ASSUME dataregister:type [[, dataregister:type]]...
2827
ASSUME register:ERROR [[, register:ERROR]]...
2928
ASSUME [[register:]] NOTHING [[, register:NOTHING]]...

‎docs/c-language/try-except-statement-c.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ ms.suite: ""
77
ms.technology: ["cpp-language"]
88
ms.tgt_pltfrm: ""
99
ms.topic: "article"
10-
f1_keywords: ["__except", "try", "__try", "except", "__except_cpp", "__try_cpp"]
1110
dev_langs: ["C++"]
1211
helpviewer_keywords: ["try-except keyword [C]", "structured exception handling, try-except", "try-catch keyword [C]", "__try keyword [C]", "__except keyword [C]", "__except keyword [C], in try-except", "try-catch keyword [C], try-except keyword [C]"]
1312
ms.assetid: f76db9d1-fc78-417f-b71f-18e545fc01c3

‎docs/c-language/try-finally-statement-c.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ ms.suite: ""
77
ms.technology: ["cpp-language"]
88
ms.tgt_pltfrm: ""
99
ms.topic: "article"
10-
f1_keywords: ["try_cpp", "try", "finally", "finally_cpp"]
1110
dev_langs: ["C++"]
12-
helpviewer_keywords: ["try-catch keyword [C], try-finally keyword [C]", "__finally keyword [C], try-finally statement syntax", "try-finally keyword [C]", "__finally keyword [C]", "try-catch keyword [C]", "structured exception handling, try-finally"]
11+
helpviewer_keywords: ["try-finally keyword [C]", "__finally keyword [C], try-finally statement syntax", "__finally keyword [C]", "structured exception handling, try-finally"]
1312
ms.assetid: 514400c1-c322-4bf3-9e48-3047240b8a82
1413
caps.latest.revision: 7
1514
author: "mikeblome"

‎docs/c-runtime-library/standard-types.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.suite: ""
77
ms.technology: ["cpp-standard-libraries"]
88
ms.tgt_pltfrm: ""
99
ms.topic: "article"
10-
f1_keywords: ["__time64_t", "_diskfree_t", "_CRT_DUMP_CLIENT", "_fsize_t", "__timeb64", "File", "__utimeb64", "jmp_buf", "__finddata64_t", "_wfinddata_t", "_finddata_t", "utimbuf64", "wint_t", "wctrans_t", "wctype_t", "_HFILE", "_secerr_handler_func", "clock_t", "fpos_t", "_dev_t", "time64_t", "wfinddata64_t", "stat64", "ldiv_t", "_EXCEPTION_POINTERS", "terminate_function", "size_t", "timeb64", "tm", "_HEAPINFO", "unexpected_function", "_CrtMemState", "_se_translator_function", "sig_atomic_t", "_CRT_REPORT_HOOK", "_complex", "_w_finddatai64_t", "_timeb", "_onexit_t", "_RTC_ErrorNumber", "lconv", "_PNH", "_off_t", "ptrdiff_t", "time_t", "_FPIEEE_RECORD", "_exception", "__w_finddata64_t", "__stat64", "_utimbuf", "__utimbuf64", "div_t", "_CRT_ALLOC_HOOK"]
10+
f1_keywords: ["__time64_t", "_diskfree_t", "_CRT_DUMP_CLIENT", "_fsize_t", "__timeb64", "File", "__utimeb64", "jmp_buf", "__finddata64_t", "_wfinddata_t", "_finddata_t", "utimbuf64", "wint_t", "wctrans_t", "wctype_t", "_HFILE", "_secerr_handler_func", "clock_t", "fpos_t", "_dev_t", "time64_t", "wfinddata64_t", "stat64", "ldiv_t", "_EXCEPTION_POINTERS", "terminate_function", "size_t", "timeb64", "tm", "_HEAPINFO", "unexpected_function", "_CrtMemState", "_se_translator_function", "sig_atomic_t", "_CRT_REPORT_HOOK", "_complex", "_w_finddatai64_t", "_timeb", "_onexit_t", "_RTC_ErrorNumber", "lconv", "_PNH", "_off_t", "ptrdiff_t", "time_t", "_FPIEEE_RECORD", "_exception", "__w_finddata64_t", "__stat64", "_utimbuf", "__utimbuf64", "div_t", "_CRT_ALLOC_HOOK", "int8_t", "uint8_t", "int16_t", "uint16_t", "int32_t", "uint32_t", "int64_t", "int64_t", "int_least8_t", "uint_least8_t", "int_least16_t", "uint_least16_t", "int_least32_t", "uint_least32_t", "int_least64_t", "uint_least64_t", "int_fast8_t", "uint_fast8_t", "int_fast16_t", "uint_fast16_t", "int_fast32_t", "uint_fast32_t", "int_fast64_t", "uint_fast64_t", "intmax_t", "uintmax_t"]
1111
dev_langs: ["C++"]
1212
helpviewer_keywords: ["__timeb64 type", "tm type", "clock_t type", "intptr_t type", "diskfree_t type", "wctype_t type", "CRT_DUMP_CLIENT type", "sig_atomic_t type", "_PNH type", "time_t type", "wfinddata_t type", "timeb64", "CRT, standard types", "wint_t type", "_RTC_ErrorNumber type", "_diskfree_t type", "_dev_t type", "_wfinddata_t type", "HFILE type", "__utimbuf64 type", "div_t type", "_onexit_t type", "_secerr_handler_func type", "FPIEEE_RECORD type", "HEAPINFO type", "PNH type", "_CRT_ALLOC_HOOK type", "_se_translater_function type", "va_list type", "wctrans_t type", "secerr_handler_func type", "_locale_t type", "timeb type", "lconv type", "utimbuf type", "dev_t type", "unexpected_function typedef", "_complex type", "_off_t type", "off_t type", "RTC_ErrorNumber type", "_FPIEEE_RECORD type", "exception type", "_CRT_REPORT_HOOK type", "_HEAPINFO type", "ldiv_t type", "terminate_function type", "uintptr_t type", "_CRT_DUMP_CLIENT type", "_utimbuf type", "wfinddatai64_t type", "fpos_t type", "wchar_t type", "CRT_ALLOC_HOOK type", "_HFILE type", "__time64_t type", "_timeb type", "CrtMemState type", "__finddata64_t type", "_exception type", "stat type", "onexit_t type", "FILE constant", "_stat type", "finddata_t type", "__wfinddata64_t type", "ptrdiff_t type", "complex types", "_wfinddatai64_t type", "_EXCEPTION_POINTERS type", "jmp_buf type", "se_translater_function type", "size_t type", "EXCEPTION_POINTERS type", "__stat64 type", "_fsize_t type", "CRT_REPORT_HOOK type", "_finddata_t type"]
1313
ms.assetid: 23312dd2-4a6a-4d70-9b48-2a5d0d8c9f28
@@ -23,10 +23,10 @@ The Microsoft run-time library defines the following standard types and typedefs
2323

2424
|Name|Equivalent built-in type|
2525
|----------|-------------------------------|
26-
|int8_t, uint8_t|signed char, unsigned char|
27-
|int16_t, int16_t|short, unsigned short|
28-
|int32_t, uint32_t|int, unsigned int|
29-
|int64_t, int64_t|long long, unsigned long long|
26+
|int8\_t, uint8\_t|signed char, unsigned char|
27+
|int16\_t, uint16\_t|short, unsigned short|
28+
|int32\_t, uint32\_t|int, unsigned int|
29+
|int64\_t, int64\_t|long long, unsigned long long|
3030
|int_least8_t, uint_least8_t|signed char, unsigned char|
3131
|int_least16_t, uint_least16_t|short, unsigned short|
3232
|int_least32_t, uint_least32_t|int, unsigned int|

‎docs/cpp/abort-function.md‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,18 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "cpp-language"
7+
ms.technology: ["cpp-language"]
98
ms.tgt_pltfrm: ""
109
ms.topic: "language-reference"
11-
f1_keywords:
12-
- "Abort"
13-
dev_langs:
14-
- "C++"
15-
helpviewer_keywords:
16-
- "abort function"
10+
f1_keywords: ["Abort"]
11+
dev_langs: ["C++"]
12+
helpviewer_keywords: ["abort function"]
1713
ms.assetid: 3352bcc4-1a8a-4e1f-8dcc-fe30f6b50f2d
1814
caps.latest.revision: 7
1915
author: "mikeblome"
2016
ms.author: "mblome"
2117
manager: "ghogen"
22-
translation.priority.ht:
23-
- "cs-cz"
24-
- "de-de"
25-
- "es-es"
26-
- "fr-fr"
27-
- "it-it"
28-
- "ja-jp"
29-
- "ko-kr"
30-
- "pl-pl"
31-
- "pt-br"
32-
- "ru-ru"
33-
- "tr-tr"
34-
- "zh-cn"
35-
- "zh-tw"
18+
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"]
3619
---
3720
# abort Function
3821
The **abort** function, also declared in the standard include file STDLIB.H, terminates a C++ program. The difference between **exit** and **abort** is that **exit** allows the C++ run-time termination processing to take place (global object destructors will be called), whereas **abort** terminates the program immediately. For more information, see [abort](../c-runtime-library/reference/abort.md) in the *Run-Time Library Reference*.

‎docs/cpp/abstract-classes-cpp.md‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,17 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "cpp-language"
7+
ms.technology: ["cpp-language"]
98
ms.tgt_pltfrm: ""
109
ms.topic: "language-reference"
11-
dev_langs:
12-
- "C++"
13-
helpviewer_keywords:
14-
- "classes [C++], abstract"
15-
- "base classes, abstract classes"
16-
- "abstract classes"
17-
- "derived classes, abstract classes"
10+
dev_langs: ["C++"]
11+
helpviewer_keywords: ["classes [C++], abstract", "base classes [C++], abstract classes [C++]", "abstract classes [C++]", "derived classes [C++], abstract classes [C++]"]
1812
ms.assetid: f0c5975b-39de-4d68-9640-6ce57f4632e6
1913
caps.latest.revision: 7
2014
author: "mikeblome"
2115
ms.author: "mblome"
2216
manager: "ghogen"
23-
translation.priority.ht:
24-
- "cs-cz"
25-
- "de-de"
26-
- "es-es"
27-
- "fr-fr"
28-
- "it-it"
29-
- "ja-jp"
30-
- "ko-kr"
31-
- "pl-pl"
32-
- "pt-br"
33-
- "ru-ru"
34-
- "tr-tr"
35-
- "zh-cn"
36-
- "zh-tw"
17+
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"]
3718
---
3819
# Abstract Classes (C++)
3920
Abstract classes act as expressions of general concepts from which more specific classes can be derived. You cannot create an object of an abstract class type; however, you can use pointers and references to abstract class types.

‎docs/cpp/additional-startup-considerations.md‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,17 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "cpp-language"
7+
ms.technology: ["cpp-language"]
98
ms.tgt_pltfrm: ""
109
ms.topic: "language-reference"
11-
dev_langs:
12-
- "C++"
13-
helpviewer_keywords:
14-
- "program startup [C++]"
15-
- "startup code"
16-
- "initializing before main"
10+
dev_langs: ["C++"]
11+
helpviewer_keywords: ["program startup [C++]", "startup code", "initializing before main"]
1712
ms.assetid: 0e942aa6-8342-447c-b068-8980ed7622bd
1813
caps.latest.revision: 6
1914
author: "mikeblome"
2015
ms.author: "mblome"
2116
manager: "ghogen"
22-
translation.priority.ht:
23-
- "cs-cz"
24-
- "de-de"
25-
- "es-es"
26-
- "fr-fr"
27-
- "it-it"
28-
- "ja-jp"
29-
- "ko-kr"
30-
- "pl-pl"
31-
- "pt-br"
32-
- "ru-ru"
33-
- "tr-tr"
34-
- "zh-cn"
35-
- "zh-tw"
17+
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"]
3618
---
3719
# Additional Startup Considerations
3820
In C++, object construction and destruction can involve executing user code. Therefore, it is important to understand which initializations happen before entry to **main** and which destructors are invoked after exit from **main**. (For detailed information about construction and destruction of objects, see [Constructors](../cpp/constructors-cpp.md) and [Destructors](../cpp/destructors-cpp.md).)

‎docs/cpp/additional-termination-considerations.md‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,17 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "cpp-language"
7+
ms.technology: ["cpp-language"]
98
ms.tgt_pltfrm: ""
109
ms.topic: "language-reference"
11-
dev_langs:
12-
- "C++"
13-
helpviewer_keywords:
14-
- "quitting applications"
15-
- "exiting applications"
16-
- "programs [C++], terminating"
10+
dev_langs: ["C++"]
11+
helpviewer_keywords: ["quitting applications", "exiting applications", "programs [C++], terminating"]
1712
ms.assetid: acbe2332-9d8a-4a58-a471-dd652a837384
1813
caps.latest.revision: 7
1914
author: "mikeblome"
2015
ms.author: "mblome"
2116
manager: "ghogen"
22-
translation.priority.ht:
23-
- "cs-cz"
24-
- "de-de"
25-
- "es-es"
26-
- "fr-fr"
27-
- "it-it"
28-
- "ja-jp"
29-
- "ko-kr"
30-
- "pl-pl"
31-
- "pt-br"
32-
- "ru-ru"
33-
- "tr-tr"
34-
- "zh-cn"
35-
- "zh-tw"
17+
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"]
3618
---
3719
# Additional Termination Considerations
3820
You can terminate a C++ program by using **exit**, `return`, or **abort**. You can add exit processing using the `atexit` function. These are discussed in the following sections.

‎docs/cpp/additive-operators-plus-and.md‎

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,18 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "cpp-language"
7+
ms.technology: ["cpp-language"]
98
ms.tgt_pltfrm: ""
109
ms.topic: "language-reference"
11-
f1_keywords:
12-
- "-"
13-
dev_langs:
14-
- "C++"
15-
helpviewer_keywords:
16-
- "operators [C++], addition"
17-
- "subtraction operator, additive operators"
18-
- "+ operator, additive operators"
19-
- "additive operators"
20-
- "arithmetic operators [C++], additive operators"
21-
- "- operator, additive operators in C++"
10+
f1_keywords: ["+", "-"]
11+
dev_langs: ["C++"]
12+
helpviewer_keywords: ["operators [C++], addition", "subtraction operator [C++], additive operators", "+ operator [C++], additive operators", "additive operators [C++]", "arithmetic operators [C++], additive operators", "- operator [C++], additive operators in C++"]
2213
ms.assetid: d4afafe7-e201-4c69-a649-37f17756e784
2314
caps.latest.revision: 9
2415
author: "mikeblome"
2516
ms.author: "mblome"
2617
manager: "ghogen"
27-
translation.priority.ht:
28-
- "cs-cz"
29-
- "de-de"
30-
- "es-es"
31-
- "fr-fr"
32-
- "it-it"
33-
- "ja-jp"
34-
- "ko-kr"
35-
- "pl-pl"
36-
- "pt-br"
37-
- "ru-ru"
38-
- "tr-tr"
39-
- "zh-cn"
40-
- "zh-tw"
18+
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"]
4119
---
4220
# Additive Operators: + and -
4321
## Syntax
@@ -132,4 +110,4 @@ for( int i = 0; i < 10; ++i )
132110
## See Also
133111
[Expressions with Binary Operators](../cpp/expressions-with-binary-operators.md)
134112
[C++ Built-in Operators, Precedence and Associativity](../cpp/cpp-built-in-operators-precedence-and-associativity.md)
135-
[C Additive Operators](../c-language/c-additive-operators.md)
113+
[C Additive Operators](../c-language/c-additive-operators.md)

‎docs/cpp/address-of-operator-amp.md‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,23 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
66
ms.suite: ""
7-
ms.technology:
8-
- "cpp-language"
7+
ms.technology: ["cpp-language"]
98
ms.tgt_pltfrm: ""
109
ms.topic: "language-reference"
11-
f1_keywords:
12-
- "address-of"
13-
dev_langs:
14-
- "C++"
15-
helpviewer_keywords:
16-
- "address-of operator (&)"
17-
- "& operator"
18-
- "& operator, address-of operator"
10+
f1_keywords: ["&"]
11+
dev_langs: ["C++"]
12+
helpviewer_keywords: ["address-of operator (&)", "& operator", "& operator [C++], address-of operator"]
1913
ms.assetid: 2828221a-15f6-4acc-87fe-25e34feebb88
2014
caps.latest.revision: 7
2115
author: "mikeblome"
2216
ms.author: "mblome"
2317
manager: "ghogen"
24-
translation.priority.ht:
25-
- "cs-cz"
26-
- "de-de"
27-
- "es-es"
28-
- "fr-fr"
29-
- "it-it"
30-
- "ja-jp"
31-
- "ko-kr"
32-
- "pl-pl"
33-
- "pt-br"
34-
- "ru-ru"
35-
- "tr-tr"
36-
- "zh-cn"
37-
- "zh-tw"
18+
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"]
3819
---
3920
# Address-of Operator: &amp;
4021
## Syntax
4122

4223
```
43-
4424
& cast-expression
4525
```
4626

@@ -129,4 +109,4 @@ int main() {
129109
[Expressions with Unary Operators](../cpp/expressions-with-unary-operators.md)
130110
[C++ Built-in Operators, Precedence and Associativity](../cpp/cpp-built-in-operators-precedence-and-associativity.md)
131111
[Lvalue Reference Declarator: &](../cpp/lvalue-reference-declarator-amp.md)
132-
[Indirection and Address-of Operators](../c-language/indirection-and-address-of-operators.md)
112+
[Indirection and Address-of Operators](../c-language/indirection-and-address-of-operators.md)

0 commit comments

Comments
 (0)