salhelper/source/simplereferenceobject.cxx | 9 --------- 1 file changed, 9 deletions(-)
New commits: commit fb96b099ba6b4a2d1f89575ac1e8839fd16dff5e Author: Mike Kaganski <[email protected]> AuthorDate: Thu Nov 27 09:45:45 2025 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Thu Nov 27 19:20:11 2025 +0100 Drop obsolete _WIN32 special-casing These were added in commit 14143435f888cd23c5aae68eca5885acb7e52186 (#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 <[email protected]> diff --git a/salhelper/source/simplereferenceobject.cxx b/salhelper/source/simplereferenceobject.cxx index d57e7f0cdcb9..a550d1ccec14 100644 --- a/salhelper/source/simplereferenceobject.cxx +++ b/salhelper/source/simplereferenceobject.cxx @@ -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: */
