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 | bbfd34adc0e800ae2feec487a3c407873bb289e3 (patch) | |
| tree | 06e19116e923a7ae0005070e1d9a695e5b212878 /include/Platform.h | |
| parent | 70c14b70b935ae8b0656df0c8b7c64b481feea18 (diff) | |
| download | scintilla-mirror-bbfd34adc0e800ae2feec487a3c407873bb289e3.tar.gz | |
Fix warnings. Add const, constexpr, and noexcept. Initialize. Standard methods.
Replace 0 and NULL with nullptr for COM, DirectWrite and least ambiguous cases.
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 9606ecab4..8c5032596 100644 --- a/include/Platform.h +++ b/include/Platform.h @@ -535,7 +535,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); } |