diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-05-24 09:24:44 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-05-24 09:24:44 +1000 |
| commit | 9b2941ea45ed3de51c660008f75b8d15ce18cca5 (patch) | |
| tree | 16df3f0e9077887d0294c909d6fe60d72a9213a2 /include/Platform.h | |
| parent | 083e04becbb7676dc1f699e81cff61490799e21b (diff) | |
| download | scintilla-mirror-9b2941ea45ed3de51c660008f75b8d15ce18cca5.tar.gz | |
Backport: Fix warnings. Add const, constexpr, and noexcept. Initialize. Standard methods.
Replace 0 and NULL with nullptr for COM, DirectWrite and least ambiguous cases.
Backport of changeset 6974:e99161ef7bdd.
Diffstat (limited to 'include/Platform.h')
| -rw-r--r-- | include/Platform.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/Platform.h b/include/Platform.h index 7b2fe2119..4299546ad 100644 --- a/include/Platform.h +++ b/include/Platform.h @@ -512,7 +512,7 @@ public: static int DefaultFontSize(); static unsigned int DoubleClickTime(); static void DebugDisplay(const char *s); - static long LongFromTwoShorts(short a,short b) noexcept { + static constexpr long LongFromTwoShorts(short a,short b) noexcept { return (a) | ((b) << 16); } |