Removing more CodeWarrior project files.

[wxWidgets.git] / tests / streams / bstream.h

diff --git a/tests/streams/bstream.h b/tests/streams/bstream.h
index 3f5e1f1d591326805f626a463e001792b40c4e28..73041339778921b1b65126d999211033d30f2fc9 100644 (file)
--- 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 )
 
     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.
 
 ///////////////////////////////////////////////////////////////////////////////
 // Template class that implements a test for all base stream functions.


@@ -375,7 +380,7 @@ protected:
             const char *buf = "1234567890";
             (void)stream_out.Write(buf, 10);
 
             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());
             CPPUNIT_ASSERT_EQUAL(pos, stream_out.TellO());
             (void)stream_out.PutC('1');
             CPPUNIT_ASSERT_EQUAL(6, stream_out.TellO());