Skip to content

Commit 8771443

Browse files
authored
Merge pull request MicrosoftDocs#68 from Microsoft/master
Merge high pri fixes into live branch - includes breadcrumb fix
2 parents 7664389 + b1d236a commit 8771443

2 files changed

Lines changed: 114 additions & 110 deletions

File tree

‎docs/_breadcrumb/toc.yml‎

Lines changed: 105 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -4,113 +4,117 @@
44
items:
55
- name: Visual C++
66
tocHref: /cpp/
7-
topicHref: /cpp/top/visual-cpp-in-visual-studio
7+
topicHref: /cpp
88
items:
9-
- name: C++ Language
10-
tocHref: /cpp/cpp/
11-
topicHref: /cpp/cpp/cpp-language-reference
12-
- name: C Language
13-
tocHref: /cpp/c-language/
14-
topicHref: /cpp/c-language/c-language-reference
15-
- name: C/C++ Preprocessor
16-
tocHref: /cpp/preprocessor/
17-
topicHref: /cpp/c-cpp-preprocessor-reference
18-
- name: C Runtime Library
19-
tocHref: /cpp/c-runtime-library/
20-
topicHref: /cpp/c-runtime-library/c-runtime-library-reference
9+
- name: Documentation
10+
tocHref: /cpp/
11+
topicHref: /cpp/top/visual-cpp-in-visual-studio
2112
items:
22-
- name: Reference
23-
tocHref: /cpp/c-runtime-library/reference/
24-
topicHref: /cpp/c-runtime-library/reference/alphabetical-function-reference
25-
- name: C++ Standard Library
26-
tocHref: /cpp/standard-library/
27-
topicHref: /cpp/standard-library/cpp-standard-library
28-
- name: Windows
29-
tocHref: /cpp/windows/
30-
topicHref: /cpp/windows/overview-of-windows-programming-in-cpp
31-
items:
32-
- name: ATL
33-
tocHref: /cpp/atl/
34-
topicHref: /cpp/atl/atl-com-desktop-components
13+
- name: C++ Language
14+
tocHref: /cpp/cpp/
15+
topicHref: /cpp/cpp/cpp-language-reference
16+
- name: C Language
17+
tocHref: /cpp/c-language/
18+
topicHref: /cpp/c-language/c-language-reference
19+
- name: C/C++ Preprocessor
20+
tocHref: /cpp/preprocessor/
21+
topicHref: /cpp/c-cpp-preprocessor-reference
22+
- name: C Runtime Library
23+
tocHref: /cpp/c-runtime-library/
24+
topicHref: /cpp/c-runtime-library/c-runtime-library-reference
3525
items:
3626
- name: Reference
37-
tocHref: /cpp/atl/reference/
38-
topicHref: /cpp/atl/reference/atl-classes
39-
- name: MFC
40-
tocHref: /cpp/mfc/
41-
topicHref: /cpp/mfc/mfc-desktop-applications
27+
tocHref: /cpp/c-runtime-library/reference/
28+
topicHref: /cpp/c-runtime-library/reference/alphabetical-function-reference
29+
- name: C++ Standard Library
30+
tocHref: /cpp/standard-library/
31+
topicHref: /cpp/standard-library/cpp-standard-library
32+
- name: Windows
33+
tocHref: /cpp/windows/
34+
topicHref: /cpp/windows/overview-of-windows-programming-in-cpp
4235
items:
43-
- name: Reference
44-
tocHref: /cpp/mfc/reference/
45-
topicHref: /cpp/mfc/reference/mfc-classes
46-
- name: ATL/MFC Shared Classes
47-
tocHref: /cpp/atl-mfc-shared/
48-
topicHref: /cpp/atl-mfc-shared/atl-mfc-shared-classes
36+
- name: ATL
37+
tocHref: /cpp/atl/
38+
topicHref: /cpp/atl/atl-com-desktop-components
39+
items:
40+
- name: Reference
41+
tocHref: /cpp/atl/reference/
42+
topicHref: /cpp/atl/reference/atl-classes
43+
- name: MFC
44+
tocHref: /cpp/mfc/
45+
topicHref: /cpp/mfc/mfc-desktop-applications
46+
items:
47+
- name: Reference
48+
tocHref: /cpp/mfc/reference/
49+
topicHref: /cpp/mfc/reference/mfc-classes
50+
- name: ATL/MFC Shared Classes
51+
tocHref: /cpp/atl-mfc-shared/
52+
topicHref: /cpp/atl-mfc-shared/atl-mfc-shared-classes
53+
items:
54+
- name: Reference
55+
tocHref: /cpp/atl-mfc-shared/reference/
56+
topicHref: /cpp/atl-mfc/shared/reference/classes-shared-by-atl-and-mfc
57+
- name: Linux
58+
tocHref: /cpp/linux/
59+
topicHref: /cpp/linux/download-install-and-setup-the-linux-development-workload
60+
- name: .NET
61+
tocHref: /cpp/dotnet/
62+
topicHref: /cpp/dotnet/dotnet-programming-with-cpp-cli
63+
- name: Parallel Programming
64+
tocHref: /cpp/parallel/
65+
topicHref: /cpp/parallel/parallel-programming-in-visual-cpp
66+
- name: Data Access
67+
tocHref: /cpp/data/
68+
topicHref: /cpp/data/data-access
4969
items:
50-
- name: Reference
51-
tocHref: /cpp/atl-mfc-shared/reference/
52-
topicHref: /cpp/atl-mfc/shared/reference/classes-shared-by-atl-and-mfc
53-
- name: Linux
54-
tocHref: /cpp/linux/
55-
topicHref: /cpp/linux/download-install-and-setup-the-linux-development-workload
56-
- name: .NET
57-
tocHref: /cpp/dotnet/
58-
topicHref: /cpp/dotnet/dotnet-programming-with-cpp-cli
59-
- name: Parallel Programming
60-
tocHref: /cpp/parallel/
61-
topicHref: /cpp/parallel/parallel-programming-in-visual-cpp
62-
- name: Data Access
63-
tocHref: /cpp/data/
64-
topicHref: /cpp/data/data-access
65-
items:
66-
- name: OLEDB
67-
tocHref: /cpp/data/oledb/
68-
topicHref: /cpp/data/oledb/ole-db-programming
69-
- name: ODBC
70-
tocHref: /cpp/data/odbc/
71-
topicHref: /cpp/data/odbc/open-database-connectivity-odbc
72-
- name: ADO and RDO
73-
tocHref: /cpp/data/ado-rdo/
74-
topicHref: /cpp/data/ado-rdo/data-bound-controls-ado-and-rdo
75-
- name: IDE and Tools
76-
tocHref: /cpp/ide/
77-
topicHref: /cpp/ide/ide-and-tools-for-visual-cpp-development
78-
items:
79-
- name: IDE
70+
- name: OLEDB
71+
tocHref: /cpp/data/oledb/
72+
topicHref: /cpp/data/oledb/ole-db-programming
73+
- name: ODBC
74+
tocHref: /cpp/data/odbc/
75+
topicHref: /cpp/data/odbc/open-database-connectivity-odbc
76+
- name: ADO and RDO
77+
tocHref: /cpp/data/ado-rdo/
78+
topicHref: /cpp/data/ado-rdo/data-bound-controls-ado-and-rdo
79+
- name: IDE and Tools
8080
tocHref: /cpp/ide/
81-
topicHref: /cpp/ide/using-the-visual-studio-ide-for-cpp-desktop-development
82-
- name: Building
83-
tocHref: /cpp/build/
84-
tocHref: /cpp/build/building-c-cpp-programs
85-
- name: Compiler Intrinsics and Assembly Language
86-
tocHref: /cpp/intrinsics/
87-
topicHref: /cpp/intrinsics/c-cpp-intrinsics
81+
topicHref: /cpp/ide/ide-and-tools-for-visual-cpp-development
8882
items:
89-
- name: ARM
90-
tocHref: /cpp/assembler/arm/
91-
topicHref: /cpp/assembler/arm/arm-assembler-reference
92-
- name: Inline assembler
93-
tocHref: /cpp/assembler/inline/
94-
topicHref: /cpp/assembler/inline-assembler-reference
95-
- name: MASM
96-
tocHref: /cpp/assembler/masm/
97-
topicHref: /cpp/assembler/masm/microsoft-macro-assembler-reference
98-
- name: Build Reference
99-
tocHref: /cpp/build/reference/
100-
topicHref: /cpp/build/reference/c-cpp-building-reference
83+
- name: IDE
84+
tocHref: /cpp/ide/
85+
topicHref: /cpp/ide/using-the-visual-studio-ide-for-cpp-desktop-development
86+
- name: Building
87+
tocHref: /cpp/build/
88+
tocHref: /cpp/build/building-c-cpp-programs
89+
- name: Compiler Intrinsics and Assembly Language
90+
tocHref: /cpp/intrinsics/
91+
topicHref: /cpp/intrinsics/c-cpp-intrinsics
10192
items:
102-
- name: Compiler Errors
103-
tocHref: /cpp/error-messages/compiler-errors-1/
104-
topicHref: /cpp/compiler-errors-1/c-cpp-build-errors
105-
- name: Compiler Warnings
106-
tocHref: /cpp/compiler-warnings/
107-
topicHref: /cpp/compiler-warnings/compiler-warnings-c4000-through-C4199
108-
- name: Other Tools
109-
tocHref: /cpp/error-messages/tool-errors/
110-
topicHref: /cpp/error-messages/tool-errors/vectorizer-and-parallelizer-messages
111-
- name: Porting and Upgrading
112-
tocHref: /cpp/porting/
113-
topicHref: /cpp/porting/porting-and-upgrading-guide
114-
- name: Text and Strings
115-
tocHref: /cpp/text/
116-
topicHref: /cpp/text/text-and-strings
93+
- name: ARM
94+
tocHref: /cpp/assembler/arm/
95+
topicHref: /cpp/assembler/arm/arm-assembler-reference
96+
- name: Inline assembler
97+
tocHref: /cpp/assembler/inline/
98+
topicHref: /cpp/assembler/inline-assembler-reference
99+
- name: MASM
100+
tocHref: /cpp/assembler/masm/
101+
topicHref: /cpp/assembler/masm/microsoft-macro-assembler-reference
102+
- name: Build Reference
103+
tocHref: /cpp/build/reference/
104+
topicHref: /cpp/build/reference/c-cpp-building-reference
105+
items:
106+
- name: Compiler Errors
107+
tocHref: /cpp/error-messages/compiler-errors-1/
108+
topicHref: /cpp/compiler-errors-1/c-cpp-build-errors
109+
- name: Compiler Warnings
110+
tocHref: /cpp/compiler-warnings/
111+
topicHref: /cpp/compiler-warnings/compiler-warnings-c4000-through-C4199
112+
- name: Other Tools
113+
tocHref: /cpp/error-messages/tool-errors/
114+
topicHref: /cpp/error-messages/tool-errors/vectorizer-and-parallelizer-messages
115+
- name: Porting and Upgrading
116+
tocHref: /cpp/porting/
117+
topicHref: /cpp/porting/porting-and-upgrading-guide
118+
- name: Text and Strings
119+
tocHref: /cpp/text/
120+
topicHref: /cpp/text/text-and-strings

‎docs/build/reference/permissive-standards-conformance.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ translation.priority.ht:
3838
- "zh-tw"
3939
---
4040
# /permissive- (Standards conformance)
41-
Specify strict standards conformance mode to the compiler. Use this option to help you identify and fix conformance issues in your code, to make it both more correct and more portable.
41+
Specify standards conformance mode to the compiler. Use this option to help you identify and fix conformance issues in your code, to make it both more correct and more portable.
4242

4343
## Syntax
4444
```
@@ -47,20 +47,20 @@ Specify strict standards conformance mode to the compiler. Use this option to he
4747

4848
## Remarks
4949

50-
You can use the **/permissive-** compiler option to specify strict standards-conformant compiler behavior. This option disables non-standard language extensions and permissive behaviors, and sets the [/Zc](../../build/reference/zc-conformance.md) compiler options for strict conformance. In the IDE, this option also makes the IntelliSense engine underline non-conformant code.
50+
You can use the **/permissive-** compiler option to specify standards-conforming compiler behavior. This option disables permissive behaviors, and sets the [/Zc](../../build/reference/zc-conformance.md) compiler options for strict conformance. In the IDE, this option also makes the IntelliSense engine underline non-conforming code.
5151

5252
By default, the **/permissive-** option is not set. When the option is set, the compiler generates diagnostic errors or warnings when non-standard language constructs are detected in your code, including some common bugs in pre-C++11 code.
5353

54-
The **/permissive-** option sets the [/Zc:strictStrings](../../build/reference/zc-conformance.md) and [/Zc:rvalueCast](../../build/reference/zc-conformance.md) options to conformant behavior. They default to non-conforming behavior. You can pass specific /Zc options after **/permissive-** on the command line to override this behavior if needed.
54+
The **/permissive-** option sets the [/Zc:strictStrings](../../build/reference/zc-conformance.md) and [/Zc:rvalueCast](../../build/reference/zc-conformance.md) options to conforming behavior. They default to non-conforming behavior. You can pass specific **/Zc** options after **/permissive-** on the command line to override this behavior.
5555

5656
Environment-specific extensions and language areas that the standard leaves up to the implementation are not affected by **/permissive-**. For example, the Microsoft-specific `__declspec`, calling convention and structured exception handling keywords, and compiler-specific pragma directives or attributes are not flagged by the compiler in **/permissive-** mode.
5757

58-
The **/permissive-** option uses the conformance support in the current compiler version to determine which language constructs are non-conformant. The option does not determine if your code is conformant to a specific version of the C++ standard. To restrict the compiler support to more closely match the C++14 standard, use the [/std:c++14](../../build/reference/std-specify-language-standard-version.md) option.
58+
The **/permissive-** option uses the conformance support in the current compiler version to determine which language constructs are non-conforming. The option does not determine if your code conforms to a specific version of the C++ standard. To enable all implemented compiler support for the latest draft standard, use the [/std:latest](../../build/reference/std-specify-language-standard-version.md) option. To restrict the compiler support to more closely match the C++14 standard, use the [/std:c++14](../../build/reference/std-specify-language-standard-version.md) option, which is the default.
5959

60-
Not all C++11, C++14, or C++17 standard conformant code is supported by the Visual C++ compiler in Visual Studio 2017 RC. The **/permissive-** option may not detect issues regarding two-phase name lookup, binding a non-const reference to a temporary, treating copy init as direct init, allowing multiple user-defined conversions in initialization, or alternative tokens for logical operators, and other non-supported conformance areas. For more information about conformance issues in Visual C++, see [Nonstandard Behavior](../../cpp/nonstandard-behavior.md).
60+
Not all C++11, C++14, or draft C++17 standards-conforming code is supported by the Visual C++ compiler in Visual Studio 2017 RC. The **/permissive-** option may not detect issues regarding two-phase name lookup, binding a non-const reference to a temporary, treating copy init as direct init, allowing multiple user-defined conversions in initialization, or alternative tokens for logical operators, and other non-supported conformance areas. For more information about conformance issues in Visual C++, see [Nonstandard Behavior](../../cpp/nonstandard-behavior.md).
6161

6262
### How to fix your code
63-
Here are some examples of code that is detected as non-conformant when you use **/permissive-**, along with suggested ways to fix the issues.
63+
Here are some examples of code that is detected as non-conforming when you use **/permissive-**, along with suggested ways to fix the issues.
6464

6565
#### Use default as an identifier in native code
6666
```cpp
@@ -110,8 +110,8 @@ union U
110110
{
111111
U()
112112
: i(1), j(1) // error C3442: Initializing multiple members of
113-
// union: 'U::i' and 'U::j'
114-
// Remove all but one of the initializations to fix
113+
// union: 'U::i' and 'U::j'.
114+
// Remove all but one of the initializations to fix.
115115
{}
116116
int i;
117117
int j;
@@ -128,7 +128,7 @@ struct S {
128128
// void f(S *); // This declaration makes the hidden friend visible
129129

130130
using type = void (*)(S *);
131-
type p = &f; // error C2065: 'f': undeclared identifier
131+
type p = &f; // error C2065: 'f': undeclared identifier.
132132
```
133133
```cpp
134134
// Example 2

0 commit comments

Comments
 (0)