[Libreoffice-commits] core.git: include/vcl

[Stephan Bergmann]

 include/vcl/vclptr.hxx |   15 ---------------
 1 file changed, 15 deletions(-)

New commits:
commit 0cdab3fc10828233d202e064a175dc6442a4a473
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 27 14:18:13 2015 +0200

    The Mac libc++ version has problems as well,
    
    ...so remove the deleted address-of operator again for now
    
    Change-Id: I3ded1d28bf2aeb170c70bcec865c09df1eefcb08

diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index 372b817..ad7d1e2 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -223,21 +223,6 @@ public:
     {
         return (m_rInnerRef > handle.m_rInnerRef);
     }
-
-    /** Deleted address-of operator.
-
-        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>