Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some of icc 11.0 warnings and disable a few others

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-16 14:24:13 +00:00
parent 5bd57a7e4f
commit 5c69ef61f3
13 changed files with 80 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
configure.in
View File

@@ -7409,14 +7409,14 @@ dnl check for icc before gcc as icc is also recognized as gcc
if test "x$INTELCC" = "xyes" ; then if test "x$INTELCC" = "xyes" ; then
dnl Warnings which can't be easily suppressed in C code are disabled: dnl Warnings which can't be easily suppressed in C code are disabled:
dnl dnl
dnl remark #810: conversion from "x" to "y" may lose significant bits dnl #810: conversion from "x" to "y" may lose significant bits
dnl remark #869: parameter "foo" was never referenced dnl #869: parameter "foo" was never referenced
dnl remark #1572: floating-point equality and inequality comparisons dnl #1572: floating-point equality and inequality comparisons
dnl are unreliable dnl are unreliable
dnl remark #1684: conversion from pointer to same-sized integral type dnl #1684: conversion from pointer to same-sized integral type
dnl dnl #2259: non-pointer conversion from "x" to "y" may lose significant
dnl (for others see below) dnl bits
CWARNINGS="-Wall -wd810,869,981,1418,1572,1684" CWARNINGS="-Wall -wd810,869,981,1418,1572,1684,2259"
elif test "$GCC" = yes ; then elif test "$GCC" = yes ; then
CWARNINGS="-Wall -Wundef" CWARNINGS="-Wall -Wundef"
fi fi
@@ -7428,15 +7428,16 @@ if test "x$INTELCXX" = "xyes" ; then
dnl (279) are generated for standard macros and so there is nothing we can dnl (279) are generated for standard macros and so there is nothing we can
dnl do about them dnl do about them
dnl dnl
dnl remark #279: controlling expression is constant dnl #279: controlling expression is constant
dnl remark #383: value copied to temporary, reference to temporary used dnl #383: value copied to temporary, reference to temporary used
dnl remark #444: destructor for base class "xxx" is not virtual dnl #444: destructor for base class "xxx" is not virtual
dnl remark #810: conversion from "x" to "y" may lose significant bits dnl #981: operands are evaluated in unspecified order
dnl remark #869: parameter "foo" was never referenced dnl #1418: external definition with no prior declaration
dnl remark #981: operands are evaluated in unspecified order dnl #1419: external declaration in primary source file
dnl remark #1418: external definition with no prior declaration dnl #1881: argument must be a constant null pointer value
dnl remark #1419: external declaration in primary source file dnl
CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419" dnl (for others see CWARNINGS above)
CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419,1881,2259"
elif test "$GXX" = yes ; then elif test "$GXX" = yes ; then
CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy" CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy"
AX_CXXFLAGS_GCC_OPTION(-Woverloaded-virtual, CXXWARNINGS) AX_CXXFLAGS_GCC_OPTION(-Woverloaded-virtual, CXXWARNINGS)

2
include/wx/buffer.h
View File

@@ -179,7 +179,7 @@ public:
private: private:
// reference-counted data // reference-counted data
struct Data : wxPrivate::UntypedBufferData struct Data : public wxPrivate::UntypedBufferData
{ {
Data(CharType *str, Kind kind = Owned) Data(CharType *str, Kind kind = Owned)
: UntypedBufferData(str, kind) : UntypedBufferData(str, kind)

2
include/wx/defs.h
View File

@@ -268,6 +268,8 @@ typedef short int WXTYPE;
#pragma warning(disable: 1682) #pragma warning(disable: 1682)
/* conversion from "X" to "T" may lose significant bits */ /* conversion from "X" to "T" may lose significant bits */
#pragma warning(disable: 810) #pragma warning(disable: 810)
/* non-pointer conversion from "foo" to "bar" may lose significant bits */
#pragma warning(disable: 2259)
return x; return x;

4
include/wx/strconv.h
View File

@@ -279,7 +279,7 @@ private:
// the current decoder state: this is only used by ToWChar() if srcLen // the current decoder state: this is only used by ToWChar() if srcLen
// parameter is not wxNO_LEN, when working on the entire NUL-terminated // parameter is not wxNO_LEN, when working on the entire NUL-terminated
// strings we neither update nor use the state // strings we neither update nor use the state
class DecoderState : StateMode class DecoderState : private StateMode
{ {
private: private:
// current state: this one is private as we want to enforce the use of // current state: this one is private as we want to enforce the use of
@@ -311,7 +311,7 @@ private:
// encoder state is simpler as we always receive entire Unicode characters // encoder state is simpler as we always receive entire Unicode characters
// on input // on input
class EncoderState : StateMode class EncoderState : private StateMode
{ {
private: private:
Mode mode; Mode mode;

2
include/wx/strvararg.h
View File

@@ -564,7 +564,7 @@ struct wxArgNormalizerNarrowChar
// FIXME-UTF8: which one is better default in absence of fmt string // FIXME-UTF8: which one is better default in absence of fmt string
// (i.e. when used like e.g. Foo("foo", "bar", 'c', NULL)? // (i.e. when used like e.g. Foo("foo", "bar", 'c', NULL)?
if ( !fmt || fmt->GetArgumentType(index) == wxFormatString::Arg_Char ) if ( !fmt || fmt->GetArgumentType(index) == wxFormatString::Arg_Char )
m_value = wxUniChar(value).GetValue(); m_value = wx_truncate_cast(T, wxUniChar(value).GetValue());
else else
m_value = value; m_value = value;
} }

2
include/wx/unichar.h
View File

@@ -155,7 +155,7 @@ private:
{ {
#if wxUSE_UNICODE #if wxUSE_UNICODE
if ( c < 0x80 ) if ( c < 0x80 )
return c; return wx_truncate_cast(char, c);
return ToHi8bit(c); return ToHi8bit(c);
#else #else

2
src/common/imagjpeg.cpp
View File

@@ -148,7 +148,7 @@ CPP_METHODDEF(void) wx_term_source ( j_decompress_ptr cinfo )
// JPEG error manager: // JPEG error manager:
struct wx_error_mgr : jpeg_error_mgr struct wx_error_mgr : public jpeg_error_mgr
{ {
jmp_buf setjmp_buffer; /* for return to caller */ jmp_buf setjmp_buffer; /* for return to caller */
}; };

5
src/common/strconv.cpp
View File

@@ -3364,6 +3364,11 @@ wxCharBuffer wxSafeConvertWX2MB(const wchar_t *ws)
#define WX_DEFINE_GLOBAL_CONV(klass, name, ctor_args) \ #define WX_DEFINE_GLOBAL_CONV(klass, name, ctor_args) \
WX_DEFINE_GLOBAL_CONV2(klass, klass, name, ctor_args) WX_DEFINE_GLOBAL_CONV2(klass, klass, name, ctor_args)
#ifdef __INTELC__
// disable warning "variable 'xxx' was declared but never referenced"
#pragma warning(disable: 177)
#endif // Intel C++
#ifdef __WINDOWS__ #ifdef __WINDOWS__
WX_DEFINE_GLOBAL_CONV2(wxMBConv, wxMBConv_win32, wxConvLibc, wxEMPTY_PARAMETER_VALUE); WX_DEFINE_GLOBAL_CONV2(wxMBConv, wxMBConv_win32, wxConvLibc, wxEMPTY_PARAMETER_VALUE);
#else #else

99
src/common/ustring.cpp
View File

@@ -25,10 +25,10 @@
wxUString &wxUString::assignFromAscii( const char *str ) wxUString &wxUString::assignFromAscii( const char *str )
{ {
size_type len = wxStrlen( str ); size_type len = wxStrlen( str );
wxU32CharBuffer buffer( len ); wxU32CharBuffer buffer( len );
wxChar32 *ptr = buffer.data(); wxChar32 *ptr = buffer.data();
size_type i; size_type i;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
@@ -36,7 +36,7 @@ wxUString &wxUString::assignFromAscii( const char *str )
ptr++; ptr++;
str++; str++;
} }
return assign( buffer ); return assign( buffer );
} }
@@ -49,10 +49,10 @@ wxUString &wxUString::assignFromAscii( const char *str, size_type n )
len++; len++;
s++; s++;
} }
wxU32CharBuffer buffer( len ); wxU32CharBuffer buffer( len );
wxChar32 *ptr = buffer.data(); wxChar32 *ptr = buffer.data();
size_type i; size_type i;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
@@ -60,7 +60,7 @@ wxUString &wxUString::assignFromAscii( const char *str, size_type n )
ptr++; ptr++;
str++; str++;
} }
return *this; return *this;
} }
@@ -68,9 +68,6 @@ wxUString &wxUString::assignFromAscii( const char *str, size_type n )
// UTF-8 // UTF-8
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static const wxUint32 utf8_max[]=
{ 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff, 0xffffffff };
// this table gives the length of the UTF-8 encoding from its first character: // this table gives the length of the UTF-8 encoding from its first character:
const unsigned char tableUtf8Lengths[256] = { const unsigned char tableUtf8Lengths[256] = {
// single-byte sequences (ASCII): // single-byte sequences (ASCII):
@@ -110,7 +107,7 @@ wxUString &wxUString::assignFromUTF8( const char *str )
{ {
if (!str) if (!str)
return assign( wxUString() ); return assign( wxUString() );
size_type ucs4_len = 0; size_type ucs4_len = 0;
const char *p = str; const char *p = str;
while (*p) while (*p)
@@ -125,7 +122,7 @@ wxUString &wxUString::assignFromUTF8( const char *str )
wxU32CharBuffer buffer( ucs4_len ); wxU32CharBuffer buffer( ucs4_len );
wxChar32 *out = buffer.data(); wxChar32 *out = buffer.data();
p = str; p = str;
while (*p) while (*p)
{ {
@@ -178,7 +175,7 @@ wxUString &wxUString::assignFromUTF8( const char *str )
code <<= 6; code <<= 6;
code |= c & 0x3F; code |= c & 0x3F;
} }
*out = code; *out = code;
p++; p++;
} }
@@ -192,7 +189,7 @@ wxUString &wxUString::assignFromUTF8( const char *str, size_type n )
{ {
if (!str) if (!str)
return assign( wxUString() ); return assign( wxUString() );
size_type ucs4_len = 0; size_type ucs4_len = 0;
size_type utf8_pos = 0; size_type utf8_pos = 0;
const char *p = str; const char *p = str;
@@ -208,10 +205,10 @@ wxUString &wxUString::assignFromUTF8( const char *str, size_type n )
ucs4_len ++; ucs4_len ++;
p += len; p += len;
} }
wxU32CharBuffer buffer( ucs4_len ); wxU32CharBuffer buffer( ucs4_len );
wxChar32 *out = buffer.data(); wxChar32 *out = buffer.data();
utf8_pos = 0; utf8_pos = 0;
p = str; p = str;
while (*p) while (*p)
@@ -222,7 +219,7 @@ wxUString &wxUString::assignFromUTF8( const char *str, size_type n )
if (utf8_pos + 1 > n) if (utf8_pos + 1 > n)
break; break;
utf8_pos++; utf8_pos++;
*out = c; *out = c;
p++; p++;
} }
@@ -272,13 +269,13 @@ wxUString &wxUString::assignFromUTF8( const char *str, size_type n )
code <<= 6; code <<= 6;
code |= c & 0x3F; code |= c & 0x3F;
} }
*out = code; *out = code;
p++; p++;
} }
out++; out++;
} }
*out = 0; *out = 0;
return assign( buffer.data() ); return assign( buffer.data() );
@@ -288,7 +285,7 @@ wxUString &wxUString::assignFromUTF16( const wxChar16* str, size_type n )
{ {
if (!str) if (!str)
return assign( wxUString() ); return assign( wxUString() );
size_type ucs4_len = 0; size_type ucs4_len = 0;
size_type utf16_pos = 0; size_type utf16_pos = 0;
const wxChar16 *p = str; const wxChar16 *p = str;
@@ -307,10 +304,10 @@ wxUString &wxUString::assignFromUTF16( const wxChar16* str, size_type n )
{ {
len = 2; len = 2;
} }
if (utf16_pos + len > n) if (utf16_pos + len > n)
break; break;
ucs4_len++; ucs4_len++;
p += len; p += len;
utf16_pos += len; utf16_pos += len;
@@ -320,7 +317,7 @@ wxUString &wxUString::assignFromUTF16( const wxChar16* str, size_type n )
wxChar32 *out = buffer.data(); wxChar32 *out = buffer.data();
utf16_pos = 0; utf16_pos = 0;
p = str; p = str;
while (*p) while (*p)
{ {
@@ -328,7 +325,7 @@ wxUString &wxUString::assignFromUTF16( const wxChar16* str, size_type n )
{ {
if (utf16_pos + 1 > n) if (utf16_pos + 1 > n)
break; break;
*out = *p; *out = *p;
p++; p++;
utf16_pos++; utf16_pos++;
@@ -337,14 +334,14 @@ wxUString &wxUString::assignFromUTF16( const wxChar16* str, size_type n )
{ {
if (utf16_pos + 2 > n) if (utf16_pos + 2 > n)
break; break;
*out = ((p[0] - 0xd7c0) << 10) + (p[1] - 0xdc00); *out = ((p[0] - 0xd7c0) << 10) + (p[1] - 0xdc00);
p += 2; p += 2;
utf16_pos += 2; utf16_pos += 2;
} }
out++; out++;
} }
return assign( buffer.data() ); return assign( buffer.data() );
} }
@@ -352,7 +349,7 @@ wxUString &wxUString::assignFromUTF16( const wxChar16* str )
{ {
if (!str) if (!str)
return assign( wxUString() ); return assign( wxUString() );
size_type ucs4_len = 0; size_type ucs4_len = 0;
const wxChar16 *p = str; const wxChar16 *p = str;
while (*p) while (*p)
@@ -370,14 +367,14 @@ wxUString &wxUString::assignFromUTF16( const wxChar16* str )
{ {
len = 2; len = 2;
} }
ucs4_len++; ucs4_len++;
p += len; p += len;
} }
wxU32CharBuffer buffer( ucs4_len ); wxU32CharBuffer buffer( ucs4_len );
wxChar32 *out = buffer.data(); wxChar32 *out = buffer.data();
p = str; p = str;
while (*p) while (*p)
{ {
@@ -393,7 +390,7 @@ wxUString &wxUString::assignFromUTF16( const wxChar16* str )
} }
out++; out++;
} }
return assign( buffer.data() ); return assign( buffer.data() );
} }
@@ -401,9 +398,9 @@ wxUString &wxUString::assignFromCString( const char* str )
{ {
if (!str) if (!str)
return assign( wxUString() ); return assign( wxUString() );
wxWCharBuffer buffer = wxConvLibc.cMB2WC( str ); wxWCharBuffer buffer = wxConvLibc.cMB2WC( str );
return assign( buffer ); return assign( buffer );
} }
@@ -411,9 +408,9 @@ wxUString &wxUString::assignFromCString( const char* str, const wxMBConv &conv )
{ {
if (!str) if (!str)
return assign( wxUString() ); return assign( wxUString() );
wxWCharBuffer buffer = conv.cMB2WC( str ); wxWCharBuffer buffer = conv.cMB2WC( str );
return assign( buffer ); return assign( buffer );
} }
@@ -421,12 +418,12 @@ wxCharBuffer wxUString::utf8_str() const
{ {
size_type utf8_length = 0; size_type utf8_length = 0;
const wxChar32 *ptr = data(); const wxChar32 *ptr = data();
while (*ptr) while (*ptr)
{ {
wxChar32 code = *ptr; wxChar32 code = *ptr;
ptr++; ptr++;
if ( code <= 0x7F ) if ( code <= 0x7F )
{ {
utf8_length++; utf8_length++;
@@ -448,17 +445,17 @@ wxCharBuffer wxUString::utf8_str() const
// invalid range, skip // invalid range, skip
} }
} }
wxCharBuffer result( utf8_length ); wxCharBuffer result( utf8_length );
char *out = result.data(); char *out = result.data();
ptr = data(); ptr = data();
while (*ptr) while (*ptr)
{ {
wxChar32 code = *ptr; wxChar32 code = *ptr;
ptr++; ptr++;
if ( code <= 0x7F ) if ( code <= 0x7F )
{ {
out[0] = (char)code; out[0] = (char)code;
@@ -493,40 +490,40 @@ wxCharBuffer wxUString::utf8_str() const
wxPrintf( "utf8_str %s len %d\n", result, wxStrlen( result.data() ) ); wxPrintf( "utf8_str %s len %d\n", result, wxStrlen( result.data() ) );
wxPrintf( "utf8_str %s len %d\n", result, wxStrlen( result.data() ) ); wxPrintf( "utf8_str %s len %d\n", result, wxStrlen( result.data() ) );
return result; return result;
} }
wxU16CharBuffer wxUString::utf16_str() const wxU16CharBuffer wxUString::utf16_str() const
{ {
size_type utf16_length = 0; size_type utf16_length = 0;
const wxChar32 *ptr = data(); const wxChar32 *ptr = data();
while (*ptr) while (*ptr)
{ {
wxChar32 code = *ptr; wxChar32 code = *ptr;
ptr++; ptr++;
// TODO: error range checks // TODO: error range checks
if (code < 0x10000) if (code < 0x10000)
utf16_length++; utf16_length++;
else else
utf16_length += 2; utf16_length += 2;
} }
wxU16CharBuffer result( utf16_length ); wxU16CharBuffer result( utf16_length );
wxChar16 *out = result.data(); wxChar16 *out = result.data();
ptr = data(); ptr = data();
while (*ptr) while (*ptr)
{ {
wxChar32 code = *ptr; wxChar32 code = *ptr;
ptr++; ptr++;
// TODO: error range checks // TODO: error range checks
if (code < 0x10000) if (code < 0x10000)
{ {
out[0] = code; out[0] = code;
@@ -539,6 +536,6 @@ wxU16CharBuffer wxUString::utf16_str() const
out += 2; out += 2;
} }
} }
return result; return result;
} }

1
src/generic/dcpsg.cpp
View File

@@ -1226,7 +1226,6 @@ void wxPostScriptDCImpl::SetPen( const wxPen& pen )
double bluePS = (double)(blue) / 255.0; double bluePS = (double)(blue) / 255.0;
double greenPS = (double)(green) / 255.0; double greenPS = (double)(green) / 255.0;
wxString buffer;
buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS ); buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS );
buffer.Replace( ",", "." ); buffer.Replace( ",", "." );
PsPrint( buffer ); PsPrint( buffer );

1
src/generic/progdlgg.cpp
View File

@@ -148,7 +148,6 @@ wxProgressDialog::wxProgressDialog(const wxString& title,
m_msg = new wxStaticText(this, wxID_ANY, message); m_msg = new wxStaticText(this, wxID_ANY, message);
sizerTop->Add(m_msg, 0, wxLEFT | wxTOP, 2*LAYOUT_MARGIN); sizerTop->Add(m_msg, 0, wxLEFT | wxTOP, 2*LAYOUT_MARGIN);
wxSize sizeLabel = m_msg->GetSize();
if ( maximum > 0 ) if ( maximum > 0 )
{ {
int gauge_style = wxGA_HORIZONTAL; int gauge_style = wxGA_HORIZONTAL;

2
src/gtk/dialog.cpp
View File

@@ -25,7 +25,7 @@
// this is defined in src/gtk/toplevel.cpp // this is defined in src/gtk/toplevel.cpp
extern int wxOpenModalDialogsCount; extern int wxOpenModalDialogsCount;
wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop); wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

1
src/unix/mimetype.cpp
View File

@@ -603,7 +603,6 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles,
{ {
if (textfile.GetLine(i).Find(wxT("=")) != wxNOT_FOUND) if (textfile.GetLine(i).Find(wxT("=")) != wxNOT_FOUND)
{ {
wxString mimeType = textfile.GetVerb(i);
wxString desktopFile = textfile.GetCmd(i); wxString desktopFile = textfile.GetCmd(i);
if (deskTopFilesSeen.Index(desktopFile) == wxNOT_FOUND) if (deskTopFilesSeen.Index(desktopFile) == wxNOT_FOUND)