From 9b2941ea45ed3de51c660008f75b8d15ce18cca5 Mon Sep 17 00:00:00 2001 From: Neil Date: Thu, 24 May 2018 09:24:44 +1000 Subject: 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. --- include/Platform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') 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); } -- cgit v1.2.3