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 /include/svl | |
| 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 'include/svl')
| -rw-r--r-- | include/svl/instrm.hxx | 4 | ||||
| -rw-r--r-- | include/svl/outstrm.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx index 65d24f37d169..c8c914546e45 100644 --- a/include/svl/instrm.hxx +++ b/include/svl/instrm.hxx @@ -41,9 +41,9 @@ class SVL_DLLPUBLIC SvInputStream: public SvStream SVL_DLLPRIVATE bool open(); - SVL_DLLPRIVATE virtual sal_uLong GetData(void * pData, sal_uLong nSize) override; + SVL_DLLPRIVATE virtual std::size_t GetData(void * pData, std::size_t nSize) override; - SVL_DLLPRIVATE virtual sal_uLong PutData(void const *, sal_uLong) override; + SVL_DLLPRIVATE virtual std::size_t PutData(void const *, std::size_t) override; SVL_DLLPRIVATE virtual sal_uInt64 SeekPos(sal_uInt64 nPos) override; diff --git a/include/svl/outstrm.hxx b/include/svl/outstrm.hxx index d512d46ba51d..d212bfba3ccd 100644 --- a/include/svl/outstrm.hxx +++ b/include/svl/outstrm.hxx @@ -33,9 +33,9 @@ class SVL_DLLPUBLIC SvOutputStream: public SvStream { css::uno::Reference< css::io::XOutputStream > m_xStream; - SVL_DLLPRIVATE virtual sal_uLong GetData(void *, sal_uLong) override; + SVL_DLLPRIVATE virtual std::size_t GetData(void *, std::size_t) override; - SVL_DLLPRIVATE virtual sal_uLong PutData(void const * pData, sal_uLong nSize) override; + SVL_DLLPRIVATE virtual std::size_t PutData(void const * pData, std::size_t nSize) override; SVL_DLLPRIVATE virtual sal_uInt64 SeekPos(sal_uInt64) override; |