salhelper/inc/salhelper/simplereferenceobject.hxx | 4 ++++
salhelper/source/simplereferenceobject.cxx | 6 ++++++
2 files changed, 10 insertions(+)
New commits:
commit 1a06b0a46509dca80846592d48841aff4bbfe6b8
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Tue Sep 4 16:52:58 2018 +0000
Commit: Damjan Jovanovic <dam...@apache.org>
CommitDate: Tue Sep 4 16:52:58 2018 +0000
Windows really really wants a vector delete operator in salhelper's
simplereferenceobject, and won't link without it, so give it one
but keep it private so subclasses (hopefuly) can't use it, as intended.
Patch by: me
diff --git a/salhelper/inc/salhelper/simplereferenceobject.hxx
b/salhelper/inc/salhelper/simplereferenceobject.hxx
index e567ea85635e..9221e5462be5 100644
--- a/salhelper/inc/salhelper/simplereferenceobject.hxx
+++ b/salhelper/inc/salhelper/simplereferenceobject.hxx
@@ -65,6 +65,10 @@ namespace salhelper {
operators new[] and delete[]. But since arrays of reference-counted
objects are of no use, anyway, it seems best to simply declare and not
define (private) operators new[] and delete[].
+
+ Note how during the move to gbuild, the delete[] had to be implemented,
+ as missing vector delete errors stopped linking. The small consolation is
+ that is a private method, so it may as well not exist. Right?
*/
class SALHELPER_DLLPUBLIC SimpleReferenceObject
{
diff --git a/salhelper/source/simplereferenceobject.cxx
b/salhelper/source/simplereferenceobject.cxx
index 7b0c9938d0dc..6ae041447f18 100644
--- a/salhelper/source/simplereferenceobject.cxx
+++ b/salhelper/source/simplereferenceobject.cxx
@@ -68,3 +68,9 @@ void SimpleReferenceObject::operator delete(void * pPtr,
std::nothrow_t const &)
::operator delete(pPtr, std::nothrow);
#endif // WNT
}
+
+void SimpleReferenceObject::operator delete[](void * pPtr)
+ SAL_THROW(())
+{
+ ::operator delete[](pPtr);
+}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
