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

Implement string inserter for long long. This creates a problem on mingw as gcc

Browse Source 
gives a warning unless -Wno-format is used, one of the most useful warnings.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell 2005-10-15 19:16:59 +00:00
parent 4948c2b6c8
commit 3fc1adbd94
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -43452,6 +43452,11 @@ if test "x$INTELCXX" = "xyes" ; then
CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419" CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419"
elif test "$GXX" = yes ; then elif test "$GXX" = yes ; then
CXXWARNINGS="-Wall -Wundef -Wno-ctor-dtor-privacy" CXXWARNINGS="-Wall -Wundef -Wno-ctor-dtor-privacy"
case "${host}" in
*-*-cygwin* | *-*-mingw32* )
CXXWARNINGS="$CXXWARNINGS -Wno-format"
esac
fi fi
EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE" EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"

9
configure.in
View File

@ -6969,6 +6969,15 @@ 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"

8
include/wx/string.h
View File

@ -955,6 +955,14 @@ public:
// insert an unsigned long into string // insert an unsigned long into string
wxString& operator<<(unsigned long ul) wxString& operator<<(unsigned long ul)
{ return (*this) << Format(_T("%lu"), ul); } { return (*this) << Format(_T("%lu"), ul); }
#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); }
// insert an unsigned long long
wxString& operator<<(wxULongLong_t ull)
{ return (*this) << Format(_T("%") wxLongLongFmtSpec _T("u"), ull); }
#endif
// insert a float into string // insert a float into string
wxString& operator<<(float f) wxString& operator<<(float f)
{ return (*this) << Format(_T("%f"), f); } { return (*this) << Format(_T("%f"), f); }