Drop obsolete _WIN32 special-casing
These were added in commit 14143435f8
(#87812#, 2001-06-05).
The operators taking std::nothrow_t exist in MSVC now.
Change-Id: I1650b7e4ec0a60af521597bef8d3e00fc500f086
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194680
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
@@ -37,12 +37,7 @@ void *SimpleReferenceObject::operator new(std::size_t nSize)
|
||||
void *SimpleReferenceObject::operator new(std::size_t nSize,
|
||||
std::nothrow_t const &)
|
||||
{
|
||||
#if defined(_WIN32)
|
||||
return ::operator new(nSize);
|
||||
// WNT lacks a global nothrow operator new...
|
||||
#else // _WIN32
|
||||
return ::operator new(nSize, std::nothrow);
|
||||
#endif // _WIN32
|
||||
}
|
||||
|
||||
void SimpleReferenceObject::operator delete(void * pPtr)
|
||||
@@ -52,11 +47,7 @@ void SimpleReferenceObject::operator delete(void * pPtr)
|
||||
|
||||
void SimpleReferenceObject::operator delete(void * pPtr, std::nothrow_t const &)
|
||||
{
|
||||
#if defined(_WIN32)
|
||||
::operator delete(pPtr); // WNT lacks a global nothrow operator delete...
|
||||
#else // _WIN32
|
||||
::operator delete(pPtr, std::nothrow);
|
||||
#endif // _WIN32
|
||||
}
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
|
||||
Reference in New Issue
Block a user