Skip to content

Commit 96217d8

Browse files
author
Colin Robertson
authored
Merge branch 'master' into cr-star-adjacent
2 parents 26251c1 + 4b5ea95 commit 96217d8

159 files changed

Lines changed: 3822 additions & 4249 deletions

File tree

Some content is hidden

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

‎.openpublishing.redirection.json‎

Lines changed: 162 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6170,6 +6170,11 @@
61706170
"redirect_url": "../data/data-access-in-cpp",
61716171
"redirect_document_id": false
61726172
},
6173+
{
6174+
"source_path": "docs/ide/wizard-support-for-other-languages.md",
6175+
"redirect_url": "../ide/creating-desktop-projects-by-using-application-wizards",
6176+
"redirect_document_id": false
6177+
},
61736178
{
61746179
"source_path": "docs/intrinsics/index.md",
61756180
"redirect_url": "/cpp/intrinsics/compiler-intrinsics-and-assembly-language",
@@ -6345,6 +6350,156 @@
63456350
"redirect_url": "/cpp/parallel/openmp/reference/openmp-libraries",
63466351
"redirect_document_id": false
63476352
},
6353+
{
6354+
"source_path": "docs/parallel/openmp/reference/copyin.md",
6355+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-clauses#copyin",
6356+
"redirect_document_id": false
6357+
},
6358+
{
6359+
"source_path": "docs/parallel/openmp/reference/copyprivate.md",
6360+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-clauses#copyprivate",
6361+
"redirect_document_id": false
6362+
},
6363+
{
6364+
"source_path": "docs/parallel/openmp/reference/default-openmp.md",
6365+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-clauses#default-openmp",
6366+
"redirect_document_id": false
6367+
},
6368+
{
6369+
"source_path": "docs/parallel/openmp/reference/firstprivate.md",
6370+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-clauses#firstprivate",
6371+
"redirect_document_id": false
6372+
},
6373+
{
6374+
"source_path": "docs/parallel/openmp/reference/if-openmp.md",
6375+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-clauses#if-openmp",
6376+
"redirect_document_id": false
6377+
},
6378+
{
6379+
"source_path": "docs/parallel/openmp/reference/lastprivate.md",
6380+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-clauses#lastprivate",
6381+
"redirect_document_id": false
6382+
},
6383+
{
6384+
"source_path": "docs/parallel/openmp/reference/nowait.md",
6385+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-clauses#nowait",
6386+
"redirect_document_id": false
6387+
},
6388+
{
6389+
"source_path": "docs/parallel/openmp/reference/num-threads.md",
6390+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-clauses#num-threads",
6391+
"redirect_document_id": false
6392+
},
6393+
{
6394+
"source_path": "docs/parallel/openmp/reference/ordered-openmp-clauses.md",
6395+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-clauses#ordered-openmp-clauses",
6396+
"redirect_document_id": false
6397+
},
6398+
{
6399+
"source_path": "docs/parallel/openmp/reference/private-openmp.md",
6400+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-clauses#private-openmp",
6401+
"redirect_document_id": false
6402+
},
6403+
{
6404+
"source_path": "docs/parallel/openmp/reference/reduction.md",
6405+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-clauses#reduction",
6406+
"redirect_document_id": false
6407+
},
6408+
{
6409+
"source_path": "docs/parallel/openmp/reference/schedule.md",
6410+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-clauses#schedule",
6411+
"redirect_document_id": false
6412+
},
6413+
{
6414+
"source_path": "docs/parallel/openmp/reference/shared-openmp.md",
6415+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-clauses#shared-openmp",
6416+
"redirect_document_id": false
6417+
},
6418+
{
6419+
"source_path": "docs/parallel/openmp/reference/omp-lock-t.md",
6420+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-data-types#omp-lock-t",
6421+
"redirect_document_id": false
6422+
},
6423+
{
6424+
"source_path": "docs/parallel/openmp/reference/omp-nest-lock-t.md",
6425+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-data-types#omp-nest-lock-t",
6426+
"redirect_document_id": false
6427+
},
6428+
{
6429+
"source_path": "docs/parallel/openmp/reference/atomic.md",
6430+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-directives#atomic",
6431+
"redirect_document_id": false
6432+
},
6433+
{
6434+
"source_path": "docs/parallel/openmp/reference/barrier.md",
6435+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-directives#barrier",
6436+
"redirect_document_id": false
6437+
},
6438+
{
6439+
"source_path": "docs/parallel/openmp/reference/critical.md",
6440+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-directives#critical",
6441+
"redirect_document_id": false
6442+
},
6443+
{
6444+
"source_path": "docs/parallel/openmp/reference/flush-openmp.md",
6445+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-directives#flush-openmp",
6446+
"redirect_document_id": false
6447+
},
6448+
{
6449+
"source_path": "docs/parallel/openmp/reference/for-openmp.md",
6450+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-directives#for-openmp",
6451+
"redirect_document_id": false
6452+
},
6453+
{
6454+
"source_path": "docs/parallel/openmp/reference/master.md",
6455+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-directives#master",
6456+
"redirect_document_id": false
6457+
},
6458+
{
6459+
"source_path": "docs/parallel/openmp/reference/ordered-openmp-directives.md",
6460+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-directives#ordered-openmp-directives",
6461+
"redirect_document_id": false
6462+
},
6463+
{
6464+
"source_path": "docs/parallel/openmp/reference/parallel.md",
6465+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-directives#parallel",
6466+
"redirect_document_id": false
6467+
},
6468+
{
6469+
"source_path": "docs/parallel/openmp/reference/sections-openmp.md",
6470+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-directives#sections-openmp",
6471+
"redirect_document_id": false
6472+
},
6473+
{
6474+
"source_path": "docs/parallel/openmp/reference/single.md",
6475+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-directives#single",
6476+
"redirect_document_id": false
6477+
},
6478+
{
6479+
"source_path": "docs/parallel/openmp/reference/threadprivate.md",
6480+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-directives#threadprivate",
6481+
"redirect_document_id": false
6482+
},
6483+
{
6484+
"source_path": "docs/parallel/openmp/reference/omp-dynamic.md",
6485+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-environment-variables#omp-dynamic",
6486+
"redirect_document_id": false
6487+
},
6488+
{
6489+
"source_path": "docs/parallel/openmp/reference/omp-nested.md",
6490+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-environment-variables#omp-nested",
6491+
"redirect_document_id": false
6492+
},
6493+
{
6494+
"source_path": "docs/parallel/openmp/reference/omp-num-threads.md",
6495+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-environment-variables#omp-num-threads",
6496+
"redirect_document_id": false
6497+
},
6498+
{
6499+
"source_path": "docs/parallel/openmp/reference/omp-schedule.md",
6500+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-environment-variables#omp-schedule",
6501+
"redirect_document_id": false
6502+
},
63486503
{
63496504
"source_path": "docs/porting/index.md",
63506505
"redirect_url": "/cpp/porting/visual-cpp-porting-and-upgrading-guide",
@@ -8554,6 +8709,11 @@
85548709
"source_path": "docs/windows/wire-marshal.md",
85558710
"redirect_url": "/cpp/windows/attributes/wire-marshal",
85568711
"redirect_document_id": true
8557-
}
8558-
]
8712+
},
8713+
{
8714+
"source_path": "docs/windows/windows-desktop-applications-cpp.md",
8715+
"redirect_url": "/cpp/windows/desktop-applications-visual-cpp",
8716+
"redirect_document_id": true
8717+
}
8718+
]
85598719
}

‎docs/TOC.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
# [C++ Standard Library](standard-library/cpp-standard-library-reference.md)
1515
# [Windows Development](windows/overview-of-windows-programming-in-cpp.md)
1616
# [Linux Development](linux/download-install-and-setup-the-linux-development-workload.md)
17-
# [.NET Development with C++/CLI](dotnet/dotnet-programming-with-cpp-cli-visual-cpp.md)
1817
# [Cloud and Web Programming in Visual C++](cloud/cloud-and-web-programming-in-visual-cpp.md)
1918
# [Parallel Programming](parallel/parallel-programming-in-visual-cpp.md)
2019
# [Data Access](data/data-access-in-cpp.md)

‎docs/assembler/masm/proto.md‎

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "PROTO | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "08/30/2018"
4+
ms.date: "10/22/2018"
55
ms.technology: ["cpp-masm"]
66
ms.topic: "reference"
77
f1_keywords: ["PROTO"]
@@ -14,12 +14,44 @@ ms.workload: ["cplusplus"]
1414
---
1515
# PROTO
1616

17-
Prototypes a function.
17+
Prototypes a function or procedure. You can call the function prototyped by the PROTO directive by using the [INVOKE](invoke.md) directive.
1818

1919
## Syntax
2020

21-
> *label* PROTO [[*distance*]] [[*langtype*]] [[, [[*parameter*]]:*tag*]]...
21+
> *label* **PROTO** \[*distance*] \[*langtype*] \[__,__ \[*parameter*]__:__*tag*] ...
22+
23+
### Parameters
24+
25+
*label*<br/>
26+
The name of the prototyped function.
27+
28+
*distance*<br/>
29+
(Optional) Used in 16-bit memory models to override the default and indicate **NEAR** or **FAR** calls.
30+
31+
*langtype*<br/>
32+
(Optional) Sets the calling and naming convention for procedures and public symbols. Supported conventions are:
33+
34+
- 32-bit **FLAT** model: **C**, **STDCALL**
35+
36+
- 16-bit models: **C**, **BASIC**, **FORTRAN**, **PASCAL**, **SYSCALL**, **STDCALL**
37+
38+
*parameter*<br/>
39+
The optional name for a function parameter.
40+
41+
*tag*<br/>
42+
The type of a function parameter.
43+
44+
The *parameter* and *tag* parameters may appear multiple times, once for each passed argument.
45+
46+
## Example
47+
48+
This sample shows a **PROTO** declaration for a function named `addup3` that uses a **NEAR** call to override the 16-bit model default for procedure calls, and uses the **C** calling convention for stack parameters and return values. It takes two arguments, a **WORD** and a **VARARG**.
49+
50+
```MASM
51+
addup3 PROTO NEAR C, argcount:WORD, arg1:VARARG
52+
```
2253

2354
## See also
2455

25-
[Directives Reference](../../assembler/masm/directives-reference.md)<br/>
56+
[Directives Reference](directives-reference.md)<br/>
57+
[.MODEL Reference](dot-model.md)<br/>

‎docs/atl-mfc-shared/reference/cfiletime-class.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "CFileTime Class | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "10/18/2018"
55
ms.technology: ["cpp-mfc"]
66
ms.topic: "reference"
77
f1_keywords: ["CFileTime", "ATLTIME/ATL::CFileTime", "ATLTIME/ATL::CFileTime::CFileTime", "ATLTIME/ATL::CFileTime::GetCurrentTime", "ATLTIME/ATL::CFileTime::GetTime", "ATLTIME/ATL::CFileTime::LocalToUTC", "ATLTIME/ATL::CFileTime::SetTime", "ATLTIME/ATL::CFileTime::UTCToLocal", "ATLTIME/ATL::CFileTime::Day", "ATLTIME/ATL::CFileTime::Hour", "ATLTIME/ATL::CFileTime::Millisecond", "ATLTIME/ATL::CFileTime::Minute", "ATLTIME/ATL::CFileTime::Second", "ATLTIME/ATL::CFileTime::Week"]
@@ -464,4 +464,3 @@ See the example for [CFileTime::Millisecond](#millisecond).
464464
[CFileTimeSpan Class](../../atl-mfc-shared/reference/cfiletimespan-class.md)<br/>
465465
[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
466466
[ATL/MFC Shared Classes](../../atl-mfc-shared/atl-mfc-shared-classes.md)
467-

‎docs/atl-mfc-shared/reference/cfiletimespan-class.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "CFileTimeSpan Class | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "10/18/2018"
55
ms.technology: ["cpp-mfc"]
66
ms.topic: "reference"
77
f1_keywords: ["CFileTimeSpan", "ATLTIME/ATL::CFileTimeSpan", "ATLTIME/ATL::CFileTimeSpan::CFileTimeSpan", "ATLTIME/ATL::CFileTimeSpan::GetTimeSpan", "ATLTIME/ATL::CFileTimeSpan::SetTimeSpan"]
@@ -305,4 +305,3 @@ The new value for the time span in milliseconds.
305305
[CFileTime Class](../../atl-mfc-shared/reference/cfiletime-class.md)<br/>
306306
[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
307307
[ATL/MFC Shared Classes](../../atl-mfc-shared/atl-mfc-shared-classes.md)
308-

‎docs/atl-mfc-shared/reference/csimplestringt-class.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "CSimpleStringT Class | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "10/18/2018"
55
ms.technology: ["cpp-mfc"]
66
ms.topic: "reference"
77
f1_keywords: ["CSimpleStringT", "ATLSIMPSTR/ATL::CSimpleStringT", "ATLSIMPSTR/ATL::CSimpleStringT::PCXSTR", "ATLSIMPSTR/ATL::CSimpleStringT::PXSTR", "ATLSIMPSTR/ATL::CSimpleStringT::CSimpleStringT", "ATLSIMPSTR/ATL::CSimpleStringT::Append", "ATLSIMPSTR/ATL::CSimpleStringT::AppendChar", "ATLSIMPSTR/ATL::CSimpleStringT::CopyChars", "ATLSIMPSTR/ATL::CSimpleStringT::CopyCharsOverlapped", "ATLSIMPSTR/ATL::CSimpleStringT::Empty", "ATLSIMPSTR/ATL::CSimpleStringT::FreeExtra", "ATLSIMPSTR/ATL::CSimpleStringT::GetAllocLength", "ATLSIMPSTR/ATL::CSimpleStringT::GetAt", "ATLSIMPSTR/ATL::CSimpleStringT::GetBuffer", "ATLSIMPSTR/ATL::CSimpleStringT::GetBufferSetLength", "ATLSIMPSTR/ATL::CSimpleStringT::GetLength", "ATLSIMPSTR/ATL::CSimpleStringT::GetManager", "ATLSIMPSTR/ATL::CSimpleStringT::GetString", "ATLSIMPSTR/ATL::CSimpleStringT::IsEmpty", "ATLSIMPSTR/ATL::CSimpleStringT::LockBuffer", "ATLSIMPSTR/ATL::CSimpleStringT::Preallocate", "ATLSIMPSTR/ATL::CSimpleStringT::ReleaseBuffer", "ATLSIMPSTR/ATL::CSimpleStringT::ReleaseBufferSetLength", "ATLSIMPSTR/ATL::CSimpleStringT::SetAt", "ATLSIMPSTR/ATL::CSimpleStringT::SetManager", "ATLSIMPSTR/ATL::CSimpleStringT::SetString", "ATLSIMPSTR/ATL::CSimpleStringT::StringLength", "ATLSIMPSTR/ATL::CSimpleStringT::Truncate", "ATLSIMPSTR/ATL::CSimpleStringT::UnlockBuffer"]

‎docs/atl-mfc-shared/reference/csize-class.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "CSize Class | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "10/18/2018"
55
ms.technology: ["cpp-mfc"]
66
ms.topic: "reference"
77
f1_keywords: ["CSize", "ATLTYPES/ATL::CSize", "ATLTYPES/ATL::CSize::CSize"]

‎docs/atl-mfc-shared/reference/cstrbuft-class.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "CStrBufT Class | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "10/18/2018"
55
ms.technology: ["cpp-mfc"]
66
ms.topic: "reference"
77
f1_keywords: ["CStrBufT", "ATLSIMPSTR/ATL::CStrBufT", "ATLSIMPSTR/ATL::CStrBufT::CStrBufT", "ATLSIMPSTR/ATL::CStrBufT::SetLength", "ATLSIMPSTR/ATL::CStrBufT::AUTO_LENGTH", "ATLSIMPSTR/ATL::CStrBufT::SET_LENGTH"]

‎docs/atl-mfc-shared/reference/cstringt-class.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "CStringT Class | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "10/18/2018"
55
ms.technology: ["cpp-mfc"]
66
ms.topic: "reference"
77
f1_keywords: ["CStringT", "ATLSTR/ATL::CStringT", "ATLSTR/ATL::CStringT::CStringT", "ATLSTR/ATL::CStringT::AllocSysString", "ATLSTR/ATL::CStringT::AnsiToOem", "ATLSTR/ATL::CStringT::AppendFormat", "ATLSTR/ATL::CStringT::Collate", "ATLSTR/ATL::CStringT::CollateNoCase", "ATLSTR/ATL::CStringT::Compare", "ATLSTR/ATL::CStringT::CompareNoCase", "ATLSTR/ATL::CStringT::Delete", "ATLSTR/ATL::CStringT::Find", "ATLSTR/ATL::CStringT::FindOneOf", "ATLSTR/ATL::CStringT::Format", "ATLSTR/ATL::CStringT::FormatMessage", "ATLSTR/ATL::CStringT::FormatMessageV", "ATLSTR/ATL::CStringT::FormatV", "ATLSTR/ATL::CStringT::GetEnvironmentVariable", "ATLSTR/ATL::CStringT::Insert", "ATLSTR/ATL::CStringT::Left", "ATLSTR/ATL::CStringT::LoadString", "ATLSTR/ATL::CStringT::MakeLower", "ATLSTR/ATL::CStringT::MakeReverse", "ATLSTR/ATL::CStringT::MakeUpper", "ATLSTR/ATL::CStringT::Mid", "ATLSTR/ATL::CStringT::OemToAnsi", "ATLSTR/ATL::CStringT::Remove", "ATLSTR/ATL::CStringT::Replace", "ATLSTR/ATL::CStringT::ReverseFind", "ATLSTR/ATL::CStringT::Right", "ATLSTR/ATL::CStringT::SetSysString", "ATLSTR/ATL::CStringT::SpanExcluding", "ATLSTR/ATL::CStringT::SpanIncluding", "ATLSTR/ATL::CStringT::Tokenize", "ATLSTR/ATL::CStringT::Trim", "ATLSTR/ATL::CStringT::TrimLeft", "ATLSTR/ATL::CStringT::TrimRight", "CSTRINGT/CStringT", "CSTRINGT/CStringT::CStringT", "CSTRINGT/CStringT::AllocSysString", "CSTRINGT/CStringT::AnsiToOem", "CSTRINGT/CStringT::AppendFormat", "CSTRINGT/CStringT::Collate", "CSTRINGT/CStringT::CollateNoCase", "CSTRINGT/CStringT::Compare", "CSTRINGT/CStringT::CompareNoCase", "CSTRINGT/CStringT::Delete", "CSTRINGT/CStringT::Find", "CSTRINGT/CStringT::FindOneOf", "CSTRINGT/CStringT::Format", "CSTRINGT/CStringT::FormatMessage", "CSTRINGT/CStringT::FormatMessageV", "CSTRINGT/CStringT::FormatV", "CSTRINGT/CStringT::GetEnvironmentVariable", "CSTRINGT/CStringT::Insert", "CSTRINGT/CStringT::Left", "CSTRINGT/CStringT::LoadString", "CSTRINGT/CStringT::MakeLower", "CSTRINGT/CStringT::MakeReverse", "CSTRINGT/CStringT::MakeUpper", "CSTRINGT/CStringT::Mid", "CSTRINGT/CStringT::OemToAnsi", "CSTRINGT/CStringT::Remove", "CSTRINGT/CStringT::Replace", "CSTRINGT/CStringT::ReverseFind", "CSTRINGT/CStringT::Right", "CSTRINGT/CStringT::SetSysString", "CSTRINGT/CStringT::SpanExcluding", "CSTRINGT/CStringT::SpanIncluding", "CSTRINGT/CStringT::Tokenize", "CSTRINGT/CStringT::Trim", "CSTRINGT/CStringT::TrimLeft", "CSTRINGT/CStringT::TrimRight"]

0 commit comments

Comments
 (0)