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

compilation fixes for 64 bit platforms

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-16 17:41:25 +00:00
parent 9eab67251b
commit 68888eeaa8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/net/socket.cpp
View File

@@ -179,7 +179,7 @@ void SocketTestCase::ReadNormal()
sock->Read(bufSmall, WXSIZEOF(bufSmall)); sock->Read(bufSmall, WXSIZEOF(bufSmall));
CPPUNIT_ASSERT_EQUAL( wxSOCKET_NOERROR, sock->LastError() ); CPPUNIT_ASSERT_EQUAL( wxSOCKET_NOERROR, sock->LastError() );
CPPUNIT_ASSERT_EQUAL( WXSIZEOF(bufSmall), sock->LastCount() ); CPPUNIT_ASSERT_EQUAL( WXSIZEOF(bufSmall), (size_t)sock->LastCount() );
char bufBig[102400]; char bufBig[102400];
@@ -199,7 +199,7 @@ void SocketTestCase::ReadBlock()
sock->Read(bufSmall, WXSIZEOF(bufSmall)); sock->Read(bufSmall, WXSIZEOF(bufSmall));
CPPUNIT_ASSERT_EQUAL( wxSOCKET_NOERROR, sock->LastError() ); CPPUNIT_ASSERT_EQUAL( wxSOCKET_NOERROR, sock->LastError() );
CPPUNIT_ASSERT_EQUAL( WXSIZEOF(bufSmall), sock->LastCount() ); CPPUNIT_ASSERT_EQUAL( WXSIZEOF(bufSmall), (size_t)sock->LastCount() );
char bufBig[102400]; char bufBig[102400];
@@ -235,7 +235,7 @@ void SocketTestCase::ReadWaitall()
sock->Read(buf, WXSIZEOF(buf)); sock->Read(buf, WXSIZEOF(buf));
CPPUNIT_ASSERT_EQUAL( wxSOCKET_NOERROR, sock->LastError() ); CPPUNIT_ASSERT_EQUAL( wxSOCKET_NOERROR, sock->LastError() );
CPPUNIT_ASSERT_EQUAL( WXSIZEOF(buf), sock->LastCount() ); CPPUNIT_ASSERT_EQUAL( WXSIZEOF(buf), (size_t)sock->LastCount() );
} }
void SocketTestCase::UrlTest() void SocketTestCase::UrlTest()

5
tests/streams/bstream.h
View File

@@ -28,8 +28,11 @@
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( Name, COMPOSE_TEST_NAME(Name) ); \ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( Name, COMPOSE_TEST_NAME(Name) ); \
STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE( Name ) STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE( Name )
// under 64 bit platforms wxFileOffset is the same as long and we already have
// WX_CPPUNIT_ALLOW_EQUALS_TO_INT(long) in wx/cppunit.h
#if SIZEOF_LONG != 8
WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxFileOffset) WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxFileOffset)
#endif
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Template class that implements a test for all base stream functions. // Template class that implements a test for all base stream functions.