X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e98ba4589467c1ce853d93f191e0034e64ef7da..b5fe7ca67bf3121959a0b5a59afd00c1708f2f03:/tests/streams/bstream.h

diff --git a/tests/streams/bstream.h b/tests/streams/bstream.h
index 1f015314e3..7304133977 100644
--- a/tests/streams/bstream.h
+++ b/tests/streams/bstream.h
@@ -28,6 +28,11 @@
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( Name, COMPOSE_TEST_NAME(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)
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // Template class that implements a test for all base stream functions.
@@ -203,8 +208,8 @@ protected:
         // Try to Seek in the stream...
         // Note: streams not supporting this should register this test
         //       with CPPUNIT_TEST_FAIL instead of CPPUNIT_TEST.
-        CPPUNIT_ASSERT_EQUAL(wxFileOffset(2), stream_in.SeekI(2, wxFromStart));
-        CPPUNIT_ASSERT_EQUAL(wxFileOffset(4), stream_in.SeekI(2, wxFromCurrent));
+        CPPUNIT_ASSERT_EQUAL(2, stream_in.SeekI(2, wxFromStart));
+        CPPUNIT_ASSERT_EQUAL(4, stream_in.SeekI(2, wxFromCurrent));
         // Not sure the following line is correct, so test it differently.
         //CPPUNIT_ASSERT_EQUAL(stream_in.GetSize()-2, stream_in.SeekI(-2, wxFromEnd));
         CPPUNIT_ASSERT(stream_in.SeekI(-2, wxFromEnd) != wxInvalidOffset);
@@ -275,7 +280,7 @@ protected:
 
         if (stream_in.Ungetch('a'))
         {
-            CPPUNIT_ASSERT_EQUAL('a', stream_in.GetC());
+            CPPUNIT_ASSERT_EQUAL(int('a'), stream_in.GetC());
         }
     }
 
@@ -375,7 +380,7 @@ protected:
             const char *buf = "1234567890";
             (void)stream_out.Write(buf, 10);
 
-            off_t pos = stream_out.SeekO(5, wxFromStart);
+            wxFileOffset pos = stream_out.SeekO(5, wxFromStart);
             CPPUNIT_ASSERT_EQUAL(pos, stream_out.TellO());
             (void)stream_out.PutC('1');
             CPPUNIT_ASSERT_EQUAL(6, stream_out.TellO());