Skip to content

Commit f2658aa

Browse files
authored
Merge pull request MicrosoftDocs#1597 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)
2 parents 93705ce + 2bebb9e commit f2658aa

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

docs/cpp/lvalues-and-rvalues-visual-cpp.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ int main()
4646
// Correct usage: the dereferenced pointer is an lvalue.
4747
*p = i;
4848

49-
const int ci = 7;
50-
// Incorrect usage: the variable is a non-modifiable lvalue (C3892).
51-
ci = 9; // C3892
52-
5349
// Correct usage: the conditional operator returns an lvalue.
5450
((i < 3) ? i : j) = 7;
51+
52+
// Incorrect usage: the constant ci is a non-modifiable lvalue (C3892).
53+
const int ci = 7;
54+
ci = 9; // C3892
5555
}
5656
```
5757

docs/mfc/reference/wm-message-handlers-f-k.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "WM_ Message Handlers: F - K"
3-
ms.date: "11/04/2016"
3+
ms.date: "11/27/2018"
44
f1_keywords: ["ON_WM_FONTCHANGE", "ON_WM_ICONERASEBKGND", "ON_WM_KEYDOWN", "ON_WM_GETMINMAXINFO", "ON_WM_KEYUP", "ON_WM_HSCROLL", "ON_WM_KILLFOCUS", "ON_WM_HSCROLLCLIPBOARD", "ON_WM_GETDLGCODE", "ON_WM_HELPINFO", "ON_WM_INITMENUPOPUP", "ON_WM_INITMENU"]
55
helpviewer_keywords: ["ON_WM_HELPINFO [MFC]", "ON_WM_KILLFOCUS [MFC]", "ON_WM_GETMINMAXINFO [MFC]", "ON_WM_KEYUP [MFC]", "ON_WM_HSCROLL [MFC]", "ON_WM_INITMENUPOPUP [MFC]", "ON_WM_FONTCHANGE [MFC]", "ON_WM_ICONERASEBKGND [MFC]", "ON_WM_GETDLGCODE [MFC]", "ON_WM_HSCROLLCLIPBOARD [MFC]", "ON_WM_INITMENU [MFC]", "WM_ messages [MFC]", "ON_WM_KEYDOWN [MFC]"]
66
ms.assetid: 0e7de191-1499-499f-859c-62742797808e

0 commit comments

Comments
 (0)