From: Vadim Zeitlin Date: Sun, 3 May 2009 07:52:49 +0000 (+0000) Subject: std::streamoff is just a (32 bit) long under Win32 with MSVC so extra WX_CPPUNIT_ALLO... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/97818dab107f892bcd82e8657033b1f83489a8a8?ds=inline std::streamoff is just a (32 bit) long under Win32 with MSVC so extra WX_CPPUNIT_ALLOW_EQUALS_TO_INT(std::streamoff) is not needed in this case; this also seems to be the case for Borland and Watcom so assume this is always so for Windows compilers git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/tests/streams/stdstream.cpp b/tests/streams/stdstream.cpp index a5212e5e1f..2033e10c0a 100644 --- a/tests/streams/stdstream.cpp +++ b/tests/streams/stdstream.cpp @@ -29,10 +29,13 @@ // 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 builds use -// long as streamoff and if this is wrong we'll add a check to configure later -#if SIZEOF_SIZE_T != 8 - WX_CPPUNIT_ALLOW_EQUALS_TO_INT(std::streamoff) +// 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 // ==========================================================================