X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e98ba4589467c1ce853d93f191e0034e64ef7da..fe5816f08f6ca7b5b1e3c309cb8b4d874814aa25:/tests/streams/bstream.h?ds=sidebyside

diff --git a/tests/streams/bstream.h b/tests/streams/bstream.h
index 1f015314e3..f3ae238c33 100644
--- a/tests/streams/bstream.h
+++ b/tests/streams/bstream.h
@@ -28,7 +28,6 @@
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( Name, COMPOSE_TEST_NAME(Name) ); \
     STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE( Name )
 
-
 ///////////////////////////////////////////////////////////////////////////////
 // Template class that implements a test for all base stream functions.
 //
@@ -203,8 +202,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 +274,7 @@ protected:
 
         if (stream_in.Ungetch('a'))
         {
-            CPPUNIT_ASSERT_EQUAL('a', stream_in.GetC());
+            CPPUNIT_ASSERT_EQUAL(int('a'), stream_in.GetC());
         }
     }
 
@@ -375,7 +374,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());
@@ -401,7 +400,7 @@ protected:
     {
         if (m_pCurrentIn)
         {
-            wxFAIL_MSG(_T("Error in test case, the previouse input stream needs to be delete first!"));
+            wxFAIL_MSG(wxT("Error in test case, the previouse input stream needs to be delete first!"));
         }
 
         m_pCurrentIn = DoCreateInStream();
@@ -412,7 +411,7 @@ protected:
     {
         if (m_pCurrentOut)
         {
-            wxFAIL_MSG(_T("Error in test case, the previouse output stream needs to be delete first!"));
+            wxFAIL_MSG(wxT("Error in test case, the previouse output stream needs to be delete first!"));
         }
 
         m_pCurrentOut = DoCreateOutStream();