diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-28 09:09:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-29 09:05:39 +0200 |
| commit | 37f9fdc11c4e95d6a34cb515a454503256a82c63 (patch) | |
| tree | 35099c65caf4c62451a5b7a7c0bac249473c9733 /svl | |
| parent | 4c91b89d8ce9c34179f31854dc88bd0a9fa84cba (diff) | |
replace rtl_allocateMemory with std::malloc
where used directly, since rtl_allocateMemory now just calls into std::malloc
Change-Id: I59f85bdb7efdf6baa30e8fcd2370c0f8e9c999ad
Reviewed-on: https://gerrit.libreoffice.org/59685
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/misc/strmadpt.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index 07e9b62fe310..1e9abecd1fb5 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -460,7 +460,7 @@ void SvDataPipe_Impl::remove(Page * pPage) pPage->m_pPrev->m_pNext = pPage->m_pNext; pPage->m_pNext->m_pPrev = pPage->m_pPrev; - rtl_freeMemory(pPage); + std::free(pPage); --m_nPages; } @@ -470,7 +470,7 @@ SvDataPipe_Impl::~SvDataPipe_Impl() for (Page * pPage = m_pFirstPage;;) { Page * pNext = pPage->m_pNext; - rtl_freeMemory(pPage); + std::free(pPage); if (pNext == m_pFirstPage) break; pPage = pNext; @@ -523,9 +523,9 @@ void SvDataPipe_Impl::write(sal_Int8 const * pBuffer, sal_uInt32 nSize) if (m_pWritePage == nullptr) { m_pFirstPage - = static_cast< Page * >(rtl_allocateMemory(sizeof (Page) - + m_nPageSize - - 1)); + = static_cast< Page * >(std::malloc(sizeof (Page) + + m_nPageSize + - 1)); m_pFirstPage->m_pPrev = m_pFirstPage; m_pFirstPage->m_pNext = m_pFirstPage; m_pFirstPage->m_pStart = m_pFirstPage->m_aBuffer; @@ -593,7 +593,7 @@ void SvDataPipe_Impl::write(sal_Int8 const * pBuffer, sal_uInt32 nSize) break; Page * pNew - = static_cast< Page * >(rtl_allocateMemory( + = static_cast< Page * >(std::malloc( sizeof (Page) + m_nPageSize - 1)); pNew->m_pPrev = m_pWritePage; |