AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modify wxString::operator<<(wxLongLong_t) to avoid warnings from mingw

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell 2005-10-31 20:27:17 +00:00
parent e4809643b4
commit b7859132ae
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.in
View File

@ -6978,15 +6978,6 @@ if test "x$INTELCXX" = "xyes" ; then
elif test "$GXX" = yes ; then
dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
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
EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"

10
include/wx/string.h
View File

@ -958,10 +958,16 @@ public:
#if defined wxLongLong_t && !defined wxLongLongIsLong
// insert a long long if they exist and aren't longs
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
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
// insert a float into string
wxString& operator<<(float f)