diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-27 13:31:56 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-27 13:31:56 +0200 |
commit | a570e3070943845d3e52c1d0cd406b1a530bf0c4 (patch) | |
tree | a104ccb52c525a072383a8efcdb8868fa8ace6be /include | |
parent | a99a04d3f85f531f9243569939599d7b0a16d9e7 (diff) |
Work around broken MSVC standard library
Change-Id: I9bbe6d231cc784f786dc5e31a641b8789fc35eb9
Diffstat (limited to 'include')
-rw-r--r-- | include/vcl/vclptr.hxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx index c1b1fb656926..372b8178c6c3 100644 --- a/include/vcl/vclptr.hxx +++ b/include/vcl/vclptr.hxx @@ -229,8 +229,15 @@ public: To avoid confusion whether it returns the address of either the pointed-to raw object (for which to use VclPtr::get instead) or the wrapper itself (for which to use std::addressof instead). + + (Cannot be deleted at least with MSVC 12, as at least the innards of + std::stable_sort on a std::vector<VclPtr<T>>, as called from + TaskPaneList::FindNextSplitter in vcl/source/window/taskpanelist.cxx + require an address-of operator for VclPtr<T>.) */ +#if !defined _MSC_VER void operator &() = delete; +#endif }; // class VclPtr template<typename T1, typename T2> |