[Libreoffice-commits] core.git: sal/qa

Caolán McNamara caolanm at redhat.com
Fri Jun 3 20:15:54 UTC 2016


 sal/qa/osl/file/osl_File.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 411e7e88030d86e64339a53462d2fb06180c3538
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 3 21:15:08 2016 +0100

    fix 32bit linux build
    
    Change-Id: Ib42627c04b2c06e34f2dd108f8a04eaea916488a

diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 79d46cc..155dfec 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -1734,7 +1734,7 @@ namespace osl_FileStatus
             test_Attributes &= rFileStatus.getAttributes();
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getAttributes function: Hidden files( Solaris version )",
-                                    osl_File_Attribute_Hidden, test_Attributes );
+                                    static_cast<sal_Int32>(osl_File_Attribute_Hidden), test_Attributes );
         }
 #else                                    //Windows version
         void getAttributes_004()
@@ -2608,14 +2608,14 @@ namespace osl_File
                 nError1 = testFile.setPos( osl_Pos_Current, 1 );
                 CPPUNIT_ASSERT_EQUAL( nError1, ::osl::FileBase::E_None );
             }
-             nError1 = testFile.getPos( nFilePointer );
+            nError1 = testFile.getPos( nFilePointer );
             CPPUNIT_ASSERT_EQUAL( nError1, ::osl::FileBase::E_None );
 
             nError1 = testFile.close();
             CPPUNIT_ASSERT_EQUAL( nError1, ::osl::FileBase::E_None );
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for isEndOfFile function: use isEndOfFile to move pointer step by step",
-                                      nFilePointer, sizeof( pBuffer_Char ) + 1 );
+                                      nFilePointer, static_cast<sal_uInt64>(sizeof( pBuffer_Char ) + 1) );
         }
         CPPUNIT_TEST_SUITE( isEndOfFile );
         CPPUNIT_TEST( isEndOfFile_001 );


More information about the Libreoffice-commits mailing list