diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-09-14 17:01:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-09-15 12:01:11 +0200 |
| commit | b647996a9babbee7b33cf45192e57df6a124628b (patch) | |
| tree | ddc6dfe8a62ec53fbacc4eeccfeb20019f3ef4f0 /cppu | |
| parent | a19a67e20e847a42063559694ec5beec71abcfb3 (diff) | |
replace sal_Size with std::size_t (or sal_uInt64 for SvStream pos)
... except in include/rtl, include/sal, include/uno, where sal_Size is
retained for compatibility, and where callers of rtl functions pass in
pointers that are incompatible on MSVC.
Change-Id: I8344453780689f5120ba0870e44965b6d292450c
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/source/threadpool/threadpool.cxx | 4 | ||||
| -rw-r--r-- | cppu/source/uno/sequence.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index 0f3199fd378a..8f1304a5990e 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.cxx @@ -361,9 +361,9 @@ struct uno_ThreadPool_Equal struct uno_ThreadPool_Hash { - sal_Size operator () ( const uno_ThreadPool &a ) const + std::size_t operator () ( const uno_ThreadPool &a ) const { - return reinterpret_cast<sal_Size>( a ); + return reinterpret_cast<std::size_t>( a ); } }; diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx index 28828b16b1ba..e7a6465b12e9 100644 --- a/cppu/source/uno/sequence.cxx +++ b/cppu/source/uno/sequence.cxx @@ -42,7 +42,7 @@ namespace cppu static inline uno_Sequence * reallocSeq( - uno_Sequence * pReallocate, sal_Size nElementSize, sal_Int32 nElements ) + uno_Sequence * pReallocate, std::size_t nElementSize, sal_Int32 nElements ) { OSL_ASSERT( nElements >= 0 ); uno_Sequence * pNew = nullptr; |