Skip to content

Commit 2fedd39

Browse files
authored
Merge pull request #5504 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main)
2 parents 8c1afc5 + ac18787 commit 2fedd39

File tree

7 files changed

+13
-17
lines changed

7 files changed

+13
-17
lines changed

docs/cpp/protected-cpp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The **`protected`** keyword specifies access to class members in the *member-lis
3030

3131
When preceding the name of a base class, the **`protected`** keyword specifies that the public and protected members of the base class are protected members of its derived classes.
3232

33-
Protected members are not as private as **`private`** members, which are accessible only to members of the class in which they are declared, but they are not as public as **`public`** members, which are accessible in any function.
33+
Protected members are not as private as **`private`** members, which are accessible only to members of the class in which they are declared but they are not as public as **`public`** members, which are accessible in any function.
3434

3535
Protected members that are also declared as **`static`** are accessible to any friend or member function of a derived class. Protected members that are not declared as **`static`** are accessible to friends and member functions in a derived class only through a pointer to, reference to, or object of the derived class.
3636

@@ -75,7 +75,7 @@ int main() {
7575
y.Display();
7676
// x.Protfunc(); error, Protfunc() is protected
7777
y.useProtfunc(); // OK, uses public access function
78-
// in derived class
78+
// in the derived class
7979
}
8080
```
8181

docs/error-messages/compiler-errors-1/compiler-error-c2128.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
description: "Learn more about: Compiler Error C2128"
33
title: "Compiler Error C2128"
44
ms.date: "11/04/2016"
5-
f1_keywords: ["c2128"]
5+
f1_keywords: ["C2128"]
66
helpviewer_keywords: ["C2128"]
7-
ms.assetid: 08cbf734-75b3-49f2-9026-9b319947612d
87
---
98
# Compiler Error C2128
109

docs/error-messages/compiler-errors-1/fatal-error-c1192.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
description: "Learn more about: Fatal Error C1192"
33
title: "Fatal Error C1192"
44
ms.date: "11/04/2016"
5-
f1_keywords: ["c1192"]
5+
f1_keywords: ["C1192"]
66
helpviewer_keywords: ["C1192"]
7-
ms.assetid: 54cff717-a3eb-471d-9bd4-1c2e673dbbef
87
---
98
# Fatal Error C1192
109

docs/error-messages/compiler-warnings/compiler-warning-c5072.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
description: "Learn more about: Compiler Warning (level 1) c5072"
3-
title: "Compiler Warning (level 1) c5072"
2+
description: "Learn more about: Compiler Warning (level 1) C5072"
3+
title: "Compiler Warning (level 1) C5072"
44
ms.date: 02/09/2024
5-
f1_keywords: ["c5072"]
6-
helpviewer_keywords: ["c5072"]
5+
f1_keywords: ["C5072"]
6+
helpviewer_keywords: ["C5072"]
77
---
8-
# Compiler Warning (level 1) c5072
8+
# Compiler Warning (level 1) C5072
99

1010
> ASAN enabled without debug information emission. Enable debug info for better ASAN error reporting
1111

docs/error-messages/compiler-warnings/compiler-warning-level-3-c4534.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
description: "Learn more about: Compiler Warning (level 3) C4534"
33
title: "Compiler Warning (level 3) C4534"
44
ms.date: "11/04/2016"
5-
f1_keywords: ["c4534"]
5+
f1_keywords: ["C4534"]
66
helpviewer_keywords: ["C4534"]
7-
ms.assetid: ec2adf3b-d7a1-4005-bb0c-5d219df78dc8
87
---
98
# Compiler Warning (level 3) C4534
109

docs/error-messages/compiler-warnings/compiler-warning-level-4-c4254.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
description: "Learn more about: Compiler Warning (level 4) C4254"
33
title: "Compiler Warning (level 4) C4254"
44
ms.date: "11/04/2016"
5-
f1_keywords: ["c4254"]
5+
f1_keywords: ["C4254"]
66
helpviewer_keywords: ["C4254"]
7-
ms.assetid: c7dcef24-d535-4c98-bb41-fc3d2b88fd11
87
---
98
# Compiler Warning (level 4) C4254
109

docs/error-messages/compiler-warnings/compiler-warning-level-4-c4389.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: "Compiler Warning (level 4) C4389"
3-
description: "Microsoft C/C++ compiler warning C4389, its causes and resolution."
3+
description: "Learn more about: Compiler Warning (level 4) C4389"
44
ms.date: 10/16/2020
5-
f1_keywords: ["c4389"]
5+
f1_keywords: ["C4389"]
66
helpviewer_keywords: ["C4389"]
77
---
88
# Compiler Warning (level 4) C4389

0 commit comments

Comments
 (0)