From efc05c0a1ecac549c8340a8f9ec4e47556569adc Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 13 May 2016 21:12:44 +0200 Subject: [PATCH] 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 Reviewed-by: Michael Stahl --- 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(-) diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx index 021f82798b18..88929f41f53b 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 inline T * get_pointer(COMReference const& p) - { - return p.get(); - } } diff --git a/include/com/sun/star/uno/Reference.h b/include/com/sun/star/uno/Reference.h index 368c9982a2fd..5f4fea0d87fa 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 -inline T * get_pointer( Reference const& r ) -{ - return r.get(); -} -/// @endcond - } } } diff --git a/include/o3tl/cow_wrapper.hxx b/include/o3tl/cow_wrapper.hxx index f9811b48a374..7e9c3af29afa 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 inline T * get_pointer( const cow_wrapper& r ) - { - return r.get(); - } - } #endif /* INCLUDED_O3TL_COW_WRAPPER_HXX */ diff --git a/include/rtl/ref.hxx b/include/rtl/ref.hxx index 685b7f2d2a2c..b70088bcdfd3 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 -inline T * get_pointer( Reference const& r ) -{ - return r.get(); -} -/// @endcond - } // namespace rtl #endif /* ! INCLUDED_RTL_REF_HXX */