From 2fe208917976a66a315c83672cc2242ffb2ac88a Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 12 May 2016 08:42:02 +0200 Subject: Update BGFX, BX, Benchmark and RapidJSON (nw) --- 3rdparty/bgfx/examples/common/entry/entry.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '3rdparty/bgfx/examples/common/entry/entry.cpp') diff --git a/3rdparty/bgfx/examples/common/entry/entry.cpp b/3rdparty/bgfx/examples/common/entry/entry.cpp index 919a783c9dc..0e03876a17e 100644 --- a/3rdparty/bgfx/examples/common/entry/entry.cpp +++ b/3rdparty/bgfx/examples/common/entry/entry.cpp @@ -188,7 +188,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); const bool isNumber = (Key::Key0 <= _key && _key <= Key::Key9); if (isNumber) { - return '0' + (_key - Key::Key0); + return '0' + char(_key - Key::Key0); } const bool isChar = (Key::KeyA <= _key && _key <= Key::KeyZ); @@ -197,7 +197,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); enum { ShiftMask = Modifier::LeftShift|Modifier::RightShift }; const bool shift = !!(_modifiers&ShiftMask); - return (shift ? 'A' : 'a') + (_key - Key::KeyA); + return (shift ? 'A' : 'a') + char(_key - Key::KeyA); } switch (_key) @@ -538,7 +538,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); { _reset = s_reset; bgfx::reset(_width, _height, _reset); - inputSetMouseResolution(_width, _height); + inputSetMouseResolution(uint16_t(_width), uint16_t(_height) ); } _debug = s_debug; @@ -692,7 +692,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); if (handle.idx == 0) { - inputSetMouseResolution(win.m_width, win.m_height); + inputSetMouseResolution(uint16_t(win.m_width), uint16_t(win.m_height) ); } } @@ -700,7 +700,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); { _reset = s_reset; bgfx::reset(s_window[0].m_width, s_window[0].m_height, _reset); - inputSetMouseResolution(s_window[0].m_width, s_window[0].m_height); + inputSetMouseResolution(uint16_t(s_window[0].m_width), uint16_t(s_window[0].m_height) ); } _debug = s_debug; -- cgit v1.2.3-70-g09d2