Modify wxString::operator<<(wxLongLong_t) to avoid warnings from mingw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -6978,15 +6978,6 @@ if test "x$INTELCXX" = "xyes" ; then
|
|||||||
elif test "$GXX" = yes ; then
|
elif test "$GXX" = yes ; then
|
||||||
dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
|
dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
|
||||||
CXXWARNINGS="-Wall -Wundef -Wno-ctor-dtor-privacy"
|
CXXWARNINGS="-Wall -Wundef -Wno-ctor-dtor-privacy"
|
||||||
|
|
||||||
dnl -Wno-format is a terrifically useful warning, however mingw warns
|
|
||||||
dnl whenever the I64 format specifier is used for long long.
|
|
||||||
dnl FIXME: it we detected when cygwin is using -mno-cygwin we could avoid
|
|
||||||
dnl disabling it for cygwin.
|
|
||||||
case "${host}" in
|
|
||||||
*-*-cygwin* | *-*-mingw32* )
|
|
||||||
CXXWARNINGS="$CXXWARNINGS -Wno-format"
|
|
||||||
esac
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
|
EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
|
||||||
|
@@ -958,10 +958,16 @@ public:
|
|||||||
#if defined wxLongLong_t && !defined wxLongLongIsLong
|
#if defined wxLongLong_t && !defined wxLongLongIsLong
|
||||||
// insert a long long if they exist and aren't longs
|
// insert a long long if they exist and aren't longs
|
||||||
wxString& operator<<(wxLongLong_t ll)
|
wxString& operator<<(wxLongLong_t ll)
|
||||||
{ return (*this) << Format(_T("%") wxLongLongFmtSpec _T("d"), ll); }
|
{
|
||||||
|
const wxChar *fmt = _T("%") wxLongLongFmtSpec _T("d");
|
||||||
|
return (*this) << Format(fmt, ll);
|
||||||
|
}
|
||||||
// insert an unsigned long long
|
// insert an unsigned long long
|
||||||
wxString& operator<<(wxULongLong_t ull)
|
wxString& operator<<(wxULongLong_t ull)
|
||||||
{ return (*this) << Format(_T("%") wxLongLongFmtSpec _T("u"), ull); }
|
{
|
||||||
|
const wxChar *fmt = _T("%") wxLongLongFmtSpec _T("u");
|
||||||
|
return (*this) << Format(fmt , ull);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
// insert a float into string
|
// insert a float into string
|
||||||
wxString& operator<<(float f)
|
wxString& operator<<(float f)
|
||||||
|
Reference in New Issue
Block a user