Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow comparison of int with 64 bit integer type (see #10637)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-05-03 09:59:31 +00:00
parent 9dfe9a1a12
commit 61b1a51bde
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/cppunit.h
View File

@@ -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)
WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned long) 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 // Use this macro to compare a wxArrayString with the pipe-separated elements
// of the given string // of the given string
// //

11
tests/streams/stdstream.cpp
View File

@@ -27,17 +27,6 @@
#include <string.h> #include <string.h>
#include "wx/mstream.h" #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 // Definitions
// ========================================================================== // ==========================================================================