From da1b0ee3d267a611f950f3122aa513fce689506a Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Wed, 14 Mar 2012 16:51:51 +0200 Subject: client: fix two narrowing conversion c++-11 warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Warnings are from initializing members of type int from uint32_t. Fix is to change alt_image and red_icon height and width fields to ints. Example warning fixed: res.cpp:58:1: error: narrowing conversion of ‘_red_icon.::width’ from ‘const uint32_t {aka const unsigned int}’ to ‘int’ inside { } is ill-formed in C++11 [-Werror=narrowing] Signed-off-by: Alon Levy --- client/x11/images/red_icon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client/x11/images/red_icon.c') diff --git a/client/x11/images/red_icon.c b/client/x11/images/red_icon.c index ce1a7d45..143d4e2d 100644 --- a/client/x11/images/red_icon.c +++ b/client/x11/images/red_icon.c @@ -1,6 +1,6 @@ static const struct { - uint32_t width; - uint32_t height; + int width; + int height; uint8_t pixmap[4096]; uint8_t mask[128]; } _red_icon = { 32, 32, { -- cgit