From bbfd34adc0e800ae2feec487a3c407873bb289e3 Mon Sep 17 00:00:00 2001 From: Neil Date: Thu, 24 May 2018 09:24:44 +1000 Subject: Fix warnings. Add const, constexpr, and noexcept. Initialize. Standard methods. Replace 0 and NULL with nullptr for COM, DirectWrite and least ambiguous cases. --- include/Platform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/Platform.h') 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); } -- cgit v1.2.3