From 0203c8cd674d1c53adace200219c0a95871365bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 4 Oct 2004 19:47:55 +0000 Subject: [PATCH] Warning fixes to most detailed warning output of OpenWatcom. Tested under Borland, DigitalMars and MinGW. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/encconv.cpp | 2 +- src/common/longlong.cpp | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp index dd7c28d520..727de49016 100644 --- a/src/common/encconv.cpp +++ b/src/common/encconv.cpp @@ -106,7 +106,7 @@ static CharsetItem* BuildReverseTable(wxUint16 *tbl) CharsetItem *rev = new CharsetItem[128]; for (int i = 0; i < 128; i++) - rev[i].c = 128 + i, rev[i].u = tbl[i]; + rev[i].c = wxUint8(128 + i), rev[i].u = tbl[i]; qsort(rev, 128, sizeof(CharsetItem), CompareCharsetItems); diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp index ba2c4100fb..304264faf0 100644 --- a/src/common/longlong.cpp +++ b/src/common/longlong.cpp @@ -50,14 +50,14 @@ void *wxLongLongNative::asArray() const { static unsigned char temp[8]; - temp[0] = (m_ll >> 56) & 0xFF; - temp[1] = (m_ll >> 48) & 0xFF; - temp[2] = (m_ll >> 40) & 0xFF; - temp[3] = (m_ll >> 32) & 0xFF; - temp[4] = (m_ll >> 24) & 0xFF; - temp[5] = (m_ll >> 16) & 0xFF; - temp[6] = (m_ll >> 8) & 0xFF; - temp[7] = (m_ll >> 0) & 0xFF; + temp[0] = (unsigned char)((m_ll >> 56) & 0xFF); + temp[1] = (unsigned char)((m_ll >> 48) & 0xFF); + temp[2] = (unsigned char)((m_ll >> 40) & 0xFF); + temp[3] = (unsigned char)((m_ll >> 32) & 0xFF); + temp[4] = (unsigned char)((m_ll >> 24) & 0xFF); + temp[5] = (unsigned char)((m_ll >> 16) & 0xFF); + temp[6] = (unsigned char)((m_ll >> 8) & 0xFF); + temp[7] = (unsigned char)((m_ll >> 0) & 0xFF); return temp; } @@ -66,14 +66,14 @@ void *wxULongLongNative::asArray() const { static unsigned char temp[8]; - temp[0] = (m_ll >> 56) & 0xFF; - temp[1] = (m_ll >> 48) & 0xFF; - temp[2] = (m_ll >> 40) & 0xFF; - temp[3] = (m_ll >> 32) & 0xFF; - temp[4] = (m_ll >> 24) & 0xFF; - temp[5] = (m_ll >> 16) & 0xFF; - temp[6] = (m_ll >> 8) & 0xFF; - temp[7] = (m_ll >> 0) & 0xFF; + temp[0] = (unsigned char)((m_ll >> 56) & 0xFF); + temp[1] = (unsigned char)((m_ll >> 48) & 0xFF); + temp[2] = (unsigned char)((m_ll >> 40) & 0xFF); + temp[3] = (unsigned char)((m_ll >> 32) & 0xFF); + temp[4] = (unsigned char)((m_ll >> 24) & 0xFF); + temp[5] = (unsigned char)((m_ll >> 16) & 0xFF); + temp[6] = (unsigned char)((m_ll >> 8) & 0xFF); + temp[7] = (unsigned char)((m_ll >> 0) & 0xFF); return temp; } -- 2.45.2