Skip to content

Commit e7fb15b

Browse files
authored
Merge pull request MicrosoftDocs#1635 from corob-msft/cr-orphans
Fix orphaned file issues.
2 parents 67fcf4e + 2199412 commit e7fb15b

10 files changed

+20
-34
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2694,6 +2694,11 @@
26942694
"redirect_url": "/cpp/dotnet/pure-and-verifiable-code-cpp-cli",
26952695
"redirect_document_id": false
26962696
},
2697+
{
2698+
"source_path": "docs/dotnet/mixed-pure-and-verifiable-feature-comparison-cpp-cli.md",
2699+
"redirect_url": "/cpp/dotnet/pure-and-verifiable-code-cpp-cli",
2700+
"redirect_document_id": false
2701+
},
26972702
{
26982703
"source_path": "docs/dotnet/greater-equal-stl-clr.md",
26992704
"redirect_url": "/cpp/dotnet/functional-stl-clr#greater_equal",
@@ -6729,6 +6734,11 @@
67296734
"redirect_url": "/cpp/parallel/amp/reference/reference-cpp-amp",
67306735
"redirect_document_id": false
67316736
},
6737+
{
6738+
"source_path": "docs/parallel/concrt/convert-an-openmp-loop-that uses-exception-handling.md",
6739+
"redirect_url": "/cpp/parallel/concrt/convert-an-openmp-loop-that-uses-exception-handling",
6740+
"redirect_document_id": true
6741+
},
67326742
{
67336743
"source_path": "docs/parallel/concrt/index.md",
67346744
"redirect_url": "/cpp/parallel/concrt/concurrency-runtime",

docs/dotnet/mixed-pure-and-verifiable-feature-comparison-cpp-cli.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

docs/error-messages/compiler-warnings/TOC.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,7 @@
508508
## [Compiler Warning (level 1) C4838](compiler-warning-level-1-c4838.md)
509509
## [Compiler Warning (level 3) C4839](compiler-warning-level-3-c4839.md)
510510
## [Compiler Warning (level 4) C4840](compiler-warning-level-4-c4840.md)
511+
## [Compiler Warning (level 4) C4866](c4866.md)
511512
## [Compiler Warning C4867](compiler-warning-c4867.md)
512513
## [Compiler Warning C4868](compiler-warning-c4868.md)
513514
## [Compiler Warning (level 1) C4900](compiler-warning-level-1-c4900.md)

docs/linux/TOC.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
## [C/C++ Properties (Linux)](prop-pages/c-cpp-linux.md)
1313
## [Linker Properties (Linux)](prop-pages/linker-linux.md)
1414
## [Build Event Properties (Linux)](prop-pages/build-events-linux.md)
15-
## [Custom Build Step Properties (Linux)](prop-pages/custom-build-step-linux.md)
16-
## [Makefile Project Properties (Linux)](prop-pages/makefile-linux.md)
15+
## [Custom Build Step Properties (Linux)](prop-pages/custom-build-step-linux.md)
16+
## [Makefile Project Properties (Linux)](prop-pages/makefile-linux.md)
17+
## [Remote Archive Properties (Linux)](prop-pages/remote-ar-linux.md)

docs/mfc/reference/TOC.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# [MFC Classes](mfc-classes.md)
2-
## [CAccelerateDecelerateTransition Class1](cacceleratedeceleratetransition-class1.md)
2+
## [CAccelerateDecelerateTransition Class](cacceleratedeceleratetransition-class.md)
33
## [CAnimateCtrl Class](canimatectrl-class.md)
44
## [CAnimationBaseObject Class](canimationbaseobject-class.md)
55
## [CAnimationColor Class](canimationcolor-class.md)

docs/parallel/concrt/TOC.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## [Migrating from OpenMP to the Concurrency Runtime](migrating-from-openmp-to-the-concurrency-runtime.md)
88
### [How to: Convert an OpenMP parallel for Loop to Use the Concurrency Runtime](how-to-convert-an-openmp-parallel-for-loop-to-use-the-concurrency-runtime.md)
99
### [How to: Convert an OpenMP Loop that Uses Cancellation to Use the Concurrency Runtime](convert-an-openmp-loop-that-uses-cancellation.md)
10-
### [How to: Convert an OpenMP Loop that Uses Exception Handling to Use the Concurrency Runtime](convert-an-openmp-loop-that uses-exception-handling.md)
10+
### [How to: Convert an OpenMP Loop that Uses Exception Handling to Use the Concurrency Runtime](convert-an-openmp-loop-that-uses-exception-handling.md)
1111
### [How to: Convert an OpenMP Loop that Uses a Reduction Variable to Use the Concurrency Runtime](convert-an-openmp-loop-that-uses-a-reduction-variable.md)
1212
# [Parallel Patterns Library (PPL)](parallel-patterns-library-ppl.md)
1313
## [Task Parallelism (Concurrency Runtime)](task-parallelism-concurrency-runtime.md)

docs/parallel/concrt/convert-an-openmp-loop-that uses-exception-handling.md renamed to docs/parallel/concrt/convert-an-openmp-loop-that-uses-exception-handling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ In the Concurrency Runtime, when you throw an exception in the body of a work fu
1616

1717
This example demonstrates how to handle exceptions in an OpenMP `parallel` region and in a call to `parallel_for`. The `do_work` function performs a memory allocation request that does not succeed and therefore throws an exception of type [std::bad_alloc](../../standard-library/bad-alloc-class.md). In the version that uses OpenMP, the thread that throws the exception must also catch it. In other words, each iteration of an OpenMP parallel loop must handle the exception. In the version that uses the Concurrency Runtime, the main thread catches an exception that is thrown by another thread.
1818

19-
[!code-cpp[concrt-openmp#3](../../parallel/concrt/codesnippet/cpp/convert-an-openmp-loop-that uses-exception-handling_1.cpp)]
19+
[!code-cpp[concrt-openmp#3](../../parallel/concrt/codesnippet/cpp/convert-an-openmp-loop-that-uses-exception-handling_1.cpp)]
2020

2121
This example produces the following output.
2222

docs/parallel/concrt/migrating-from-openmp-to-the-concurrency-runtime.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Given a basic loop that uses the OpenMP [parallel](../../parallel/concrt/how-to-
4747
[How to: Convert an OpenMP Loop that Uses Cancellation to Use the Concurrency Runtime](../../parallel/concrt/convert-an-openmp-loop-that-uses-cancellation.md)<br/>
4848
Given an OpenMP [parallel](../../parallel/concrt/how-to-use-parallel-invoke-to-write-a-parallel-sort-routine.md#parallel)[for](../../parallel/openmp/reference/for-openmp.md) loop that does not require all iterations to run, demonstrates how to convert it to use the Concurrency Runtime cancellation mechanism.
4949

50-
[How to: Convert an OpenMP Loop that Uses Exception Handling to Use the Concurrency Runtime](../../parallel/concrt/convert-an-openmp-loop-that uses-exception-handling.md)<br/>
50+
[How to: Convert an OpenMP Loop that Uses Exception Handling to Use the Concurrency Runtime](../../parallel/concrt/convert-an-openmp-loop-that-uses-exception-handling.md)<br/>
5151
Given an OpenMP [parallel](../../parallel/concrt/how-to-use-parallel-invoke-to-write-a-parallel-sort-routine.md#parallel)[for](../../parallel/openmp/reference/for-openmp.md) loop that performs exception handling, demonstrates how to convert it to use the Concurrency Runtime exception handling mechanism.
5252

5353
[How to: Convert an OpenMP Loop that Uses a Reduction Variable to Use the Concurrency Runtime](../../parallel/concrt/convert-an-openmp-loop-that-uses-a-reduction-variable.md)<br/>

docs/parallel/concrt/reference/TOC.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,12 @@
9191
### [task_canceled Class](task-canceled-class.md)
9292
### [task_completion_event Class](task-completion-event-class.md)
9393
### [task_continuation_context Class](task-continuation-context-class.md)
94+
### [task_group Class](task-group-class.md)
9495
### [task_handle Class](task-handle-class.md)
9596
### [task_options Class (Concurrency Runtime)](task-options-class-concurrency-runtime.md)
9697
### [timer Class](timer-class.md)
9798
### [transformer Class](transformer-class.md)
99+
### [unbounded_buffer Class](unbounded-buffer-class.md)
98100
### [unsupported_os Class](unsupported-os-class.md)
99101
## [std Namespace](std-namespace.md)
100102
### [make_exception_ptr Function](make-exception-ptr-function.md)

0 commit comments

Comments
 (0)