[Libreoffice-commits] core.git: canvas/source include/com include/o3tl include/rtl

Michael Stahl mstahl at redhat.com
Fri May 13 21:51:42 UTC 2016


 canvas/source/directx/dx_winstuff.hxx |    5 -----
 include/com/sun/star/uno/Reference.h  |   10 ----------
 include/o3tl/cow_wrapper.hxx          |    6 ------
 include/rtl/ref.hxx                   |   10 ----------
 4 files changed, 31 deletions(-)

New commits:
commit efc05c0a1ecac549c8340a8f9ec4e47556569adc
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri May 13 21:12:44 2016 +0200

    remove various crutches for boost::bind/boost::mem_fn
    
    These aren't used any more, and the C++11 std equivalents don't use
    get_pointer() overloads.
    
    Change-Id: Ib97a6a595863e21a1621c63709ea2b28f6550fde
    Reviewed-on: https://gerrit.libreoffice.org/24982
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index 021f827..88929f4 100644
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -151,11 +151,6 @@ namespace dxcanvas
         T*  mp;
     };
 
-    // get_pointer() enables boost::mem_fn to recognize COMReference
-    template<class T> inline T * get_pointer(COMReference<T> const& p)
-    {
-        return p.get();
-    }
 }
 
 
diff --git a/include/com/sun/star/uno/Reference.h b/include/com/sun/star/uno/Reference.h
index 368c998..5f4fea0 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -571,16 +571,6 @@ public:
     inline static SAL_WARN_UNUSED_RESULT Reference< interface_type > SAL_CALL query( XInterface * pInterface );
 };
 
-/// @cond INTERNAL
-/** Enables boost::mem_fn and boost::bind to recognize Reference.
-*/
-template <typename T>
-inline T * get_pointer( Reference<T> const& r )
-{
-    return r.get();
-}
-/// @endcond
-
 }
 }
 }
diff --git a/include/o3tl/cow_wrapper.hxx b/include/o3tl/cow_wrapper.hxx
index f9811b4..7e9c3af 100644
--- a/include/o3tl/cow_wrapper.hxx
+++ b/include/o3tl/cow_wrapper.hxx
@@ -343,12 +343,6 @@ int cow_wrapper_client::queryUnmodified() const
         a.swap(b);
     }
 
-    // to enable boost::mem_fn on cow_wrapper
-    template<class T, class P> inline T * get_pointer( const cow_wrapper<T,P>& r )
-    {
-        return r.get();
-    }
-
 }
 
 #endif /* INCLUDED_O3TL_COW_WRAPPER_HXX */
diff --git a/include/rtl/ref.hxx b/include/rtl/ref.hxx
index 685b7f2..b70088b 100644
--- a/include/rtl/ref.hxx
+++ b/include/rtl/ref.hxx
@@ -240,16 +240,6 @@ public:
     }
 };
 
-/// @cond INTERNAL
-/** Enables boost::mem_fn and boost::bind to recognize Reference.
-*/
-template <typename T>
-inline T * get_pointer( Reference<T> const& r )
-{
-    return r.get();
-}
-/// @endcond
-
 } // namespace rtl
 
 #endif /* ! INCLUDED_RTL_REF_HXX */


More information about the Libreoffice-commits mailing list