Skip to content

C
core
Kaydet (Commit) 931f9852 authored tarafından Herbert Dürr's avatar Herbert Dürr
Dosyalara gözat
Seçenekler

fix narrowing conversions in testtool

üst 7c2720aa
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
testtools/source/bridgetest/bridgetest.cxx
Dosyayı görüntüle @ 931f9852
...@@ -639,11 +639,11 @@ static sal_Bool performTest( ...@@ -639,11 +639,11 @@ static sal_Bool performTest(
sal_Int8 _arByte[] = { 1, 2, -1 }; sal_Int8 _arByte[] = { 1, 2, -1 };
sal_Int16 _arShort[] = { -0x8000, 1, 0x7FFF }; sal_Int16 _arShort[] = { -0x8000, 1, 0x7FFF };
sal_uInt16 _arUShort[] = { 0 , 1, 0xFFFF }; sal_uInt16 _arUShort[] = { 0 , 1, 0xFFFF };
sal_Int32 _arLong[] = { 0x80000000, 1, 0x7FFFFFFF }; sal_Int32 _arLong[] = { -0x7FFFFFFF, 1, 0x7FFFFFFF };
sal_uInt32 _arULong[] = { 0, 1, 0xFFFFFFFF }; sal_uInt32 _arULong[] = { 0, 1, 0xFFFFFFFF };
sal_Int64 _arHyper[] = { sal_Int64 _arHyper[] = {
SAL_CONST_INT64(0x8000000000000000), 1, SAL_CONST_INT64(-0x7FFFFFFFFFFFFFFF), 1,
SAL_CONST_INT64(0x7FFFFFFFFFFFFFFF) }; SAL_CONST_INT64(+0x7FFFFFFFFFFFFFFF) };
sal_uInt64 _arUHyper[] = { 0, 1, SAL_CONST_UINT64(0xFFFFFFFFFFFFFFFF) }; sal_uInt64 _arUHyper[] = { 0, 1, SAL_CONST_UINT64(0xFFFFFFFFFFFFFFFF) };
float _arFloat[] = { 1.1f, 2.2f, 3.3f }; float _arFloat[] = { 1.1f, 2.2f, 3.3f };
double _arDouble[] = { 1.11, 2.22, 3.33 }; double _arDouble[] = { 1.11, 2.22, 3.33 };
......
testtools/source/bridgetest/cppobj.cxx
Dosyayı görüntüle @ 931f9852
...@@ -486,7 +486,7 @@ Any Test_Impl::transportAny( const Any & value ) throw ( ::com::sun::star::uno:: ...@@ -486,7 +486,7 @@ Any Test_Impl::transportAny( const Any & value ) throw ( ::com::sun::star::uno::
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
void Test_Impl::call( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw(::com::sun::star::uno::RuntimeException) void Test_Impl::call( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw(::com::sun::star::uno::RuntimeException)
{ {
TimeValue value = { nWaitMUSEC / 1000000 , nWaitMUSEC * 1000 }; TimeValue value = { static_cast<unsigned>(nWaitMUSEC / 1000000), static_cast<unsigned>(nWaitMUSEC * 1000) };
osl_waitThread( &value ); osl_waitThread( &value );
if( m_bFirstCall ) if( m_bFirstCall )
{ {
...@@ -502,7 +502,7 @@ void Test_Impl::call( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw(::com::su ...@@ -502,7 +502,7 @@ void Test_Impl::call( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw(::com::su
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
void Test_Impl::callOneway( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw (::com::sun::star::uno::RuntimeException) void Test_Impl::callOneway( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw (::com::sun::star::uno::RuntimeException)
{ {
TimeValue value = { nWaitMUSEC / 1000000 , nWaitMUSEC * 1000 }; TimeValue value = { static_cast<unsigned>(nWaitMUSEC / 1000000), static_cast<unsigned>(nWaitMUSEC * 1000) };
osl_waitThread( &value ); osl_waitThread( &value );
m_bSequenceOfCallTestPassed = m_bSequenceOfCallTestPassed && (nCallId > m_nLastCallId); m_bSequenceOfCallTestPassed = m_bSequenceOfCallTestPassed && (nCallId > m_nLastCallId);
m_nLastCallId = nCallId; m_nLastCallId = nCallId;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment