summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-07-18 12:32:27 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-07-18 12:32:27 +1000
commit871f1f727f0763ffec510757933f1acf22485a59 (patch)
treefe44b89a531cd517d1c5e197da4e13c2dde7d04f
parent7a743b472dadb817eb7a6ed8063cee80ce7412e8 (diff)
Followup to final followup 647382f52351a75 of my followup
Change-Id: I0ee075cadb26eb0ceedec1dd047fc157f3929dad
-rw-r--r--sal/osl/unx/file.cxx4
-rw-r--r--sal/osl/w32/file.cxx6
2 files changed, 5 insertions, 5 deletions
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 17790211b02d..35d620813cfa 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -200,8 +200,8 @@ FileHandle_Impl::Allocator::~Allocator()
void FileHandle_Impl::Allocator::allocate(sal_uInt8 **ppBuffer, size_t *pnSize)
{
- assert(ppBuffer != nullptr);
- assert(pnSize != nullptr);
+ assert(ppBuffer);
+ assert(pnSize);
*ppBuffer = static_cast< sal_uInt8* >(rtl_cache_alloc(m_cache));
*pnSize = m_bufsiz;
}
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 3738683402af..5a5a16b9f9c0 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -181,8 +181,8 @@ FileHandle_Impl::Allocator::~Allocator()
void FileHandle_Impl::Allocator::allocate (sal_uInt8 **ppBuffer, SIZE_T * pnSize)
{
- assert(ppBuffer != nullptr);
- assert(pnSize != nullptr);
+ assert(ppBuffer);
+ assert(pnSize);
*ppBuffer = static_cast< sal_uInt8* >(rtl_cache_alloc(m_cache));
*pnSize = m_bufsiz;
}
@@ -196,7 +196,7 @@ void FileHandle_Impl::Allocator::deallocate (sal_uInt8 * pBuffer)
FileHandle_Impl::Guard::Guard(LPCRITICAL_SECTION pMutex)
: m_mutex (pMutex)
{
- assert(pMutex != nullptr);
+ assert(pMutex);
::EnterCriticalSection (m_mutex);
}