From: Vadim Zeitlin Date: Sun, 3 May 2009 09:59:31 +0000 (+0000) Subject: allow comparison of int with 64 bit integer type (see #10637) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/61b1a51bde994acba7ddaae80460a3c6fcbb9784?ds=inline allow comparison of int with 64 bit integer type (see #10637) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h index 2cdadbbd77..bd131dd57a 100644 --- a/include/wx/cppunit.h +++ b/include/wx/cppunit.h @@ -184,6 +184,11 @@ WX_CPPUNIT_ALLOW_EQUALS_TO_INT(short) WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned) WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned long) +#if defined(wxLongLong_t) && !defined(wxLongLongIsLong) +WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxLongLong_t) +WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned wxLongLong_t) +#endif + // Use this macro to compare a wxArrayString with the pipe-separated elements // of the given string // diff --git a/tests/streams/stdstream.cpp b/tests/streams/stdstream.cpp index 2033e10c0a..3fc90d6235 100644 --- a/tests/streams/stdstream.cpp +++ b/tests/streams/stdstream.cpp @@ -27,17 +27,6 @@ #include #include "wx/mstream.h" -// when std::streamoff is simply long we don't need this as we already allow -// comparisons between int and long but we do need it otherwise -- and we don't -// have any way to detect it so for now just assume that all 64 bit Unix builds -// use long as streamoff and if this is wrong we'll add a check to configure -// later -#ifndef __WXMSW__ - #if SIZEOF_SIZE_T != 8 - WX_CPPUNIT_ALLOW_EQUALS_TO_INT(std::streamoff) - #endif -#endif - // ========================================================================== // Definitions // ==========================================================================