summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2022-05-23 09:12:51 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-05-23 15:25:04 +0200
commite1b3a6edd4b3400c25aa135d75bd1ad19b279609 (patch)
treeff762e4519344d2411faa077230a4bfe0f86fbf4
parentf546767b4e9bf3de288ea50336cf1e15f1ee7435 (diff)
no need to override 'operator new' in FileHandle_Impl
it's been a while since we had our own allocator Change-Id: I091c69c94a9592657dd845387530a3fa587a8c01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134753 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--sal/osl/unx/file.cxx13
-rw-r--r--sal/osl/unx/file_impl.hxx3
-rw-r--r--sal/osl/unx/file_misc.cxx9
-rw-r--r--sal/osl/w32/file.cxx12
4 files changed, 0 insertions, 37 deletions
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 351d1457e89b..caa7f5dd57e9 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -111,9 +111,6 @@ struct FileHandle_Impl
explicit FileHandle_Impl(int fd, Kind kind = KIND_FD);
~FileHandle_Impl();
- static void* operator new (size_t n);
- static void operator delete (void * p);
-
static size_t getpagesize();
sal_uInt64 getPos() const;
@@ -221,16 +218,6 @@ FileHandle_Impl::~FileHandle_Impl()
(void) pthread_mutex_destroy(&m_mutex); // ignoring EBUSY ...
}
-void* FileHandle_Impl::operator new (size_t n)
-{
- return malloc(n);
-}
-
-void FileHandle_Impl::operator delete (void * p)
-{
- free(p);
-}
-
size_t FileHandle_Impl::getpagesize()
{
return sal::static_int_cast< size_t >(::sysconf(_SC_PAGESIZE));
diff --git a/sal/osl/unx/file_impl.hxx b/sal/osl/unx/file_impl.hxx
index a4e0c66adc57..6d5e2d740913 100644
--- a/sal/osl/unx/file_impl.hxx
+++ b/sal/osl/unx/file_impl.hxx
@@ -35,9 +35,6 @@ struct DirectoryItem_Impl
OString strFilePath, unsigned char DType = 0);
~DirectoryItem_Impl();
- static void * operator new(size_t n);
- static void operator delete (void * p);
-
void acquire(); /* @see osl_acquireDirectoryItem() */
void release(); /* @see osl_releaseDirectoryItem() */
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 50fdcc040765..b2d6010fe847 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -94,15 +94,6 @@ DirectoryItem_Impl::~DirectoryItem_Impl()
{
}
-void * DirectoryItem_Impl::operator new(size_t n)
-{
- return malloc(n);
-}
-void DirectoryItem_Impl::operator delete(void * p)
-{
- free(p);
-}
-
void DirectoryItem_Impl::acquire()
{
++m_RefCount;
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 96b2bba4b486..57d95e14dfed 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -83,8 +83,6 @@ struct FileHandle_Impl
explicit FileHandle_Impl (HANDLE hFile);
~FileHandle_Impl();
- static void* operator new(size_t n);
- static void operator delete(void * p, size_t);
static SIZE_T getpagesize();
sal_uInt64 getPos() const;
@@ -178,16 +176,6 @@ FileHandle_Impl::~FileHandle_Impl()
::DeleteCriticalSection (&m_mutex);
}
-void * FileHandle_Impl::operator new(size_t n)
-{
- return malloc(n);
-}
-
-void FileHandle_Impl::operator delete(void * p, size_t)
-{
- free(p);
-}
-
SIZE_T FileHandle_Impl::getpagesize()
{
SYSTEM_INFO info;