Skip to content

Commit 966e446

Browse files
authored
Merge pull request #1752 from MicrosoftDocs/master
2/11/2019 AM Publish
2 parents 5a7dbd6 + f825f00 commit 966e446

File tree

7 files changed

+36
-50
lines changed

7 files changed

+36
-50
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7920,6 +7920,11 @@
79207920
"redirect_url": "/cpp/windows/editable-file-types-for-resources",
79217921
"redirect_document_id": false
79227922
},
7923+
{
7924+
"source_path": "docs/windows/deleting-unassigned-symbols.md",
7925+
"redirect_url": "/cpp/windows/changing-unassigned-symbols",
7926+
"redirect_document_id": false
7927+
},
79237928
{
79247929
"source_path": "docs/windows/activationfactory-activationfactory-constructor.md",
79257930
"redirect_url": "/cpp/windows/activationfactory-class#activationfactory",

docs/error-messages/compiler-warnings/compiler-warning-level-2-c4275.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
---
22
title: "Compiler Warning (level 2) C4275"
3-
ms.date: "11/04/2016"
3+
ms.date: "02/08/2019"
44
f1_keywords: ["C4275"]
55
helpviewer_keywords: ["C4275"]
66
ms.assetid: 18de967a-0a44-4dbc-a2e8-fc4c067ba909
77
---
88
# Compiler Warning (level 2) C4275
99

10-
non - DLL-interface classkey 'identifier' used as base for DLL-interface classkey 'identifier'
10+
> non - DLL-interface class '*class_1*' used as base for DLL-interface class '*class_2*'
1111
12-
An exported class was derived from a class that was not exported.
12+
An exported class was derived from a class that wasn't exported.
1313

14-
To minimize the possibility of data corruption when exporting a class with [__declspec(dllexport)](../../cpp/dllexport-dllimport.md), ensure that:
14+
To minimize the possibility of data corruption when exporting a class with [__declspec(dllexport)](../../cpp/dllexport-dllimport.md), make sure that:
1515

1616
- All your static data is accessed through functions that are exported from the DLL.
1717

1818
- No inlined methods of your class can modify static data.
1919

20-
- No inlined methods of your class use CRT functions or other library functions use static data.
20+
- No inlined methods of your class use CRT functions or other library functions that use static data.
2121

22-
- No inlined class functions use CRT functions, or other library functions, where, for example, you access static data.
22+
- No inlined class functions use CRT functions, or other library functions, where you access static data.
2323

2424
- No methods of your class (regardless of inlining) can use types where the instantiation in the EXE and DLL have static data differences.
2525

2626
You can avoid exporting classes by defining a DLL that defines a class with virtual functions, and functions you can call to instantiate and delete objects of the type. You can then just call virtual functions on the type.
2727

28-
C4275 can be ignored in Visual C++ if you are deriving from a type in the C++ Standard Library, compiling a debug release (**/MTd**) and where the compiler error message refers to _Container_base.
28+
C4275 can be ignored in Visual C++ if you are deriving from a type in the C++ Standard Library, compiling a debug release (**/MTd**) and where the compiler error message refers to `_Container_base`.
2929

30-
```
30+
```cpp
3131
// C4275.cpp
3232
// compile with: /EHsc /MTd /W2 /c
3333
#include <vector>

docs/get-started/tutorial-console-cpp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.assetid: 45138d70-719d-42dc-90d7-1d0ca31a2f54
99
---
1010
# Create a C++ console app project
1111

12-
The usual starting point for a C++ programmer is a "Hello, world!" application that runs on the command line. That's what you'll create in Visual Studio in this step.
12+
The usual starting point for a C++ programmer is a "Hello, world!" application that runs on the command line. That's what you'll create in Visual Studio in this article.
1313

1414
## Prerequisites
1515

@@ -378,7 +378,7 @@ Let's handle division by zero more gracefully, so a user can understand the prob
378378

379379
Congratulations! You've completed the code for the calculator app, and built and debugged it in Visual Studio.
380380

381-
![Calculator console application](./media/calculator-app.gif "Calculator console application")
381+
![Calculator console application](./media/calculator-app.gif "Calculator console application")
382382

383383
## Next steps
384384

docs/parallel/openmp/4-environment-variables.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ksh:
2525
DOS:
2626
`set OMP_SCHEDULE="dynamic"`
2727

28-
## 4.1 OMP_SCHEDULE
28+
## <a name="41-omp_schedule"></a>4.1 OMP_SCHEDULE
2929

3030
`OMP_SCHEDULE` applies only to `for` and `parallel for` directives that have the schedule type `runtime`. The schedule type and chunk size for all such loops can be set at run time. Set this environment variable to any recognized schedule type and to an optional *chunk_size*.
3131

@@ -43,7 +43,7 @@ setenv OMP_SCHEDULE "dynamic"
4343
- [for](2-directives.md#241-for-construct) directive
4444
- [parallel for](2-directives.md#251-parallel-for-construct) directive
4545

46-
## 4.2 OMP_NUM_THREADS
46+
## <a name="42-omp_num_threads"></a>4.2 OMP_NUM_THREADS
4747

4848
The `OMP_NUM_THREADS` environment variable sets the default number of threads to use during execution. `OMP_NUM_THREADS` is ignored if that number is explicitly changed by calling the `omp_set_num_threads` library routine. It's also ignored if there's an explicit `num_threads` clause on a `parallel` directive.
4949

@@ -67,7 +67,7 @@ setenv OMP_NUM_THREADS 16
6767
- [omp_set_num_threads](3-run-time-library-functions.md#311-omp_set_num_threads-function) function
6868
- [omp_set_dynamic](3-run-time-library-functions.md#317-omp_set_dynamic-function) function
6969

70-
## 4.3 OMP_DYNAMIC
70+
## <a name="43-omp_dynamic"></a>4.3 OMP_DYNAMIC
7171

7272
The `OMP_DYNAMIC` environment variable enables or disables dynamic adjustment of the number of threads available for the execution of parallel regions. `OMP_DYNAMIC` is ignored when dynamic adjustment is explicitly enabled or disabled by calling the `omp_set_dynamic` library routine. Its value must be `TRUE` or `FALSE`.
7373

@@ -84,7 +84,7 @@ setenv OMP_DYNAMIC TRUE
8484
- [Parallel regions](2-directives.md#23-parallel-construct)
8585
- [omp_set_dynamic](3-run-time-library-functions.md#317-omp_set_dynamic-function) function
8686

87-
## 4.4 OMP_NESTED
87+
## <a name="44-omp_nested"></a>4.4 OMP_NESTED
8888

8989
The `OMP_NESTED` environment variable enables or disables nested parallelism unless nested parallelism is enabled or disabled by calling the `omp_set_nested` library routine. If `OMP_NESTED` is set to `TRUE`, nested parallelism is enabled. If `OMP_NESTED` is set to `FALSE`, nested parallelism is disabled. The default value is `FALSE`.
9090

docs/windows/TOC.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
### [Symbols: Resource Identifiers](symbols-resource-identifiers.md)
2424
#### [Viewing Resource Symbols](viewing-resource-symbols.md)
2525
#### [Creating New Symbols](creating-new-symbols.md)
26-
#### [Changing Unassigned Symbols](changing-unassigned-symbols.md)
27-
#### [Deleting Unassigned Symbols](deleting-unassigned-symbols.md)
26+
#### [Changing or Deleting Unassigned Symbols](changing-unassigned-symbols.md)
2827
#### [Opening the Resource Editor for a Given Symbol](opening-the-resource-editor-for-a-given-symbol.md)
2928
#### [Changing a Symbol](changing-a-symbol-or-symbol-name-id.md)
3029
#### [Including Shared (Read-Only) or Calculated Symbols](including-shared-read-only-or-calculated-symbols.md)

docs/windows/changing-unassigned-symbols.md

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,37 @@
11
---
2-
title: "Changing Unassigned Symbols"
2+
title: "Changing or Deleting Unassigned Symbols"
33
ms.date: "11/04/2016"
44
f1_keywords: ["vc.editors.symbol.changing.unassigned"]
5-
helpviewer_keywords: ["symbols [C++], unassigned", "Change Symbol dialog box [C++]", "unassigned symbols"]
5+
helpviewer_keywords: ["symbols [C++], unassigned", "Change Symbol dialog box [C++]", "unassigned symbols", "symbols [C++], deleting"]
66
ms.assetid: b6abee4a-3c24-4697-a166-fe6a86cad35f
77
---
8-
# Changing Unassigned Symbols
8+
# Changing or Deleting Unassigned Symbols
99

10-
While in the [Resource Symbols dialog box](../windows/resource-symbols-dialog-box.md), you can edit or delete existing symbols that are not already assigned to a resource or object.
10+
While in the [Resource Symbols dialog box](../windows/resource-symbols-dialog-box.md), you can edit or delete existing symbols that aren't already assigned to a resource or object.
1111

12-
### To change an unassigned symbol
12+
For information on adding resources to managed projects, see [Resources in Desktop Apps](/dotnet/framework/resources/index) in the *.NET Framework Developer's Guide*.
1313

14-
1. In the **Name** box, select the unassigned symbol, and click **Change**.
14+
## To change an unassigned symbol
1515

16-
2. Edit the symbol's name or value in the boxes provided in the **Change Symbol** dialog box.
16+
1. In the **Name** box, select the unassigned symbol, and choose **Change**.
17+
18+
1. Edit the symbol's name or value in the boxes provided in the **Change Symbol** dialog box.
1719

1820
> [!NOTE]
1921
> To change a symbol that *is* assigned to a resource or object, you must use the resource editor or **Properties** window. For more information, see [Changing a Symbol or Symbol Name](../windows/changing-a-symbol-or-symbol-name-id.md).
2022
21-
For information on adding resources to managed projects, please see [Resources in Desktop Apps](/dotnet/framework/resources/index) in the *.NET Framework Developer's Guide*.
23+
## To delete an unassigned (unused) symbol
24+
25+
In the [Resource Symbols dialog box](../windows/resource-symbols-dialog-box.md), select the symbol that you want to delete, and choose **Delete**.
26+
27+
> [!NOTE]
28+
> Before deleting an unused symbol in a resource file, make sure it is not used elsewhere in the program or by resource files included at compile time.
2229
2330
## Requirements
2431

2532
Win32
2633

27-
## See Also
34+
## See also
2835

2936
[Viewing Resource Symbols](../windows/viewing-resource-symbols.md)<br/>
3037
[Symbol Name Restrictions](../windows/symbol-name-restrictions.md)<br/>

docs/windows/deleting-unassigned-symbols.md

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

0 commit comments

Comments
 (0)