first round of Intel compiler warning fixes: down from a few thousands just to slightly more than 100
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -139,10 +139,10 @@ public:
|
||||
// accessors
|
||||
// get high part
|
||||
long GetHi() const
|
||||
{ return (long)(m_ll >> 32); }
|
||||
{ return wx_truncate_cast(long, m_ll >> 32); }
|
||||
// get low part
|
||||
unsigned long GetLo() const
|
||||
{ return (unsigned long)m_ll; }
|
||||
{ return wx_truncate_cast(unsigned long, m_ll); }
|
||||
|
||||
// get absolute value
|
||||
wxLongLongNative Abs() const { return wxLongLongNative(*this).Abs(); }
|
||||
@@ -157,12 +157,12 @@ public:
|
||||
wxASSERT_MSG( (m_ll >= LONG_MIN) && (m_ll <= LONG_MAX),
|
||||
_T("wxLongLong to long conversion loss of precision") );
|
||||
|
||||
return (long)m_ll;
|
||||
return wx_truncate_cast(long, m_ll);
|
||||
}
|
||||
|
||||
#if wxABI_VERSION >= 20602
|
||||
// convert to double
|
||||
double ToDouble() const { return m_ll; }
|
||||
double ToDouble() const { return wx_truncate_cast(double, m_ll); }
|
||||
#endif // ABI >= 2.6.2
|
||||
|
||||
// don't provide implicit conversion to wxLongLong_t or we will have an
|
||||
@@ -344,10 +344,10 @@ public:
|
||||
// accessors
|
||||
// get high part
|
||||
unsigned long GetHi() const
|
||||
{ return (unsigned long)(m_ll >> 32); }
|
||||
{ return wx_truncate_cast(unsigned long, m_ll >> 32); }
|
||||
// get low part
|
||||
unsigned long GetLo() const
|
||||
{ return (unsigned long)m_ll; }
|
||||
{ return wx_truncate_cast(unsigned long, m_ll); }
|
||||
|
||||
// convert to native ulong long
|
||||
wxULongLong_t GetValue() const { return m_ll; }
|
||||
@@ -358,7 +358,7 @@ public:
|
||||
wxASSERT_MSG( m_ll <= LONG_MAX,
|
||||
_T("wxULongLong to long conversion loss of precision") );
|
||||
|
||||
return (unsigned long)m_ll;
|
||||
return wx_truncate_cast(unsigned long, m_ll);
|
||||
}
|
||||
|
||||
// operations
|
||||
|
Reference in New Issue
Block a user