diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-06-28 21:48:22 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-03 12:21:03 +0200 |
commit | c4ddf6cd6d97e7ce7c2e63e4d393bbeffcb34e4d (patch) | |
tree | 128225fc91bd7da687f965337a49b9b64fbe8a79 /include | |
parent | 5034e8217c9844293dc94e5dff0bdc865ad7a91a (diff) |
C++11 remove std::unary_function bases from functors
std::unary_function is deprecated since C++11 and removed in C++17
90% done with regexp magic.
removed obsolete <functional> includes.
The std::unary_function base class was used in 3 places:
* chart2/source/tools/DataSeriesHelper.cxx: lcl_MatchesRole
is used in a std::not1 function helper who uses the members
return_type and argument_type.
- replace deprecated std::not1 with a lambda
* chart2/source/tools/ModifyListenerHelper.cxx:
lcl_weakReferenceToSame used the argument_type member in the
operator() parameter.
- inline the parameter type.
* xmloff/source/chart/SchXMLExport.cxx: lcl_SequenceToMapElement
used result_type and argument_type in operator().
- inline the types
Also fix compile error with gcc about finding std::for_each.
Change-Id: I073673beb01410c3108e7d0346d9e7d6b9ad2e2f
Reviewed-on: https://gerrit.libreoffice.org/39358
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/comphelper/make_shared_from_uno.hxx | 3 | ||||
-rw-r--r-- | include/connectivity/FValue.hxx | 8 | ||||
-rw-r--r-- | include/editeng/AccessibleParaManager.hxx | 5 | ||||
-rw-r--r-- | include/osl/diagnose.hxx | 3 | ||||
-rw-r--r-- | include/svl/urlfilter.hxx | 3 |
5 files changed, 9 insertions, 13 deletions
diff --git a/include/comphelper/make_shared_from_uno.hxx b/include/comphelper/make_shared_from_uno.hxx index 17496eeb4aa4..b30dde09d115 100644 --- a/include/comphelper/make_shared_from_uno.hxx +++ b/include/comphelper/make_shared_from_uno.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_COMPHELPER_MAKE_SHARED_FROM_UNO_HXX #define INCLUDED_COMPHELPER_MAKE_SHARED_FROM_UNO_HXX -#include <functional> #include <memory> namespace comphelper { @@ -27,7 +26,7 @@ namespace comphelper { /// @internal namespace detail { /// @internal -template <typename T> struct ReleaseFunc : ::std::unary_function<T *, void> { +template <typename T> struct ReleaseFunc { void operator()( T * p ) const { p->release(); } }; } // namespace detail diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx index dfde6cab9342..2c3645ea2ae8 100644 --- a/include/connectivity/FValue.hxx +++ b/include/connectivity/FValue.hxx @@ -471,8 +471,8 @@ namespace connectivity typedef ::rtl::Reference<ORowSetValueDecorator> ORowSetValueDecoratorRef; - /// TSetBound is a unary_function to set the bound value with e.q. for_each call - struct OOO_DLLPUBLIC_DBTOOLS TSetBound : ::std::unary_function<ORowSetValue,void> + /// TSetBound is a functor to set the bound value with e.q. for_each call + struct OOO_DLLPUBLIC_DBTOOLS TSetBound { bool m_bBound; TSetBound(bool _bBound) : m_bBound(_bBound){} @@ -481,8 +481,8 @@ namespace connectivity }; - /// TSetBound is a unary_function to set the bound value with e.q. for_each call - struct OOO_DLLPUBLIC_DBTOOLS TSetRefBound : ::std::unary_function<ORowSetValueDecoratorRef,void> + /// TSetBound is a functor to set the bound value with e.q. for_each call + struct OOO_DLLPUBLIC_DBTOOLS TSetRefBound { bool m_bBound; TSetRefBound(bool _bBound) : m_bBound(_bBound){} diff --git a/include/editeng/AccessibleParaManager.hxx b/include/editeng/AccessibleParaManager.hxx index af4687581f06..30d02dd846dc 100644 --- a/include/editeng/AccessibleParaManager.hxx +++ b/include/editeng/AccessibleParaManager.hxx @@ -22,7 +22,6 @@ #include <vector> #include <algorithm> -#include <functional> #include <utility> #include <tools/gen.hxx> #include <com/sun/star/awt/Rectangle.hpp> @@ -190,7 +189,7 @@ namespace accessibility void operator() ( AccessibleEditablePara& ) */ - template < typename Functor > class WeakChildAdapter : public ::std::unary_function< const WeakChild&, void > + template < typename Functor > class WeakChildAdapter { public: WeakChildAdapter( Functor& rFunctor ) : mrFunctor(rFunctor) {} @@ -216,7 +215,7 @@ namespace accessibility Create with pointer to member function of AccessibleEditableTextPara and the corresponding argument. */ - template < typename Argument > class MemFunAdapter : public ::std::unary_function< const WeakChild&, void > + template < typename Argument > class MemFunAdapter { public: typedef void (::accessibility::AccessibleEditableTextPara::*FunctionPointer)( Argument ); diff --git a/include/osl/diagnose.hxx b/include/osl/diagnose.hxx index c515eaf54827..0472ea42ea66 100644 --- a/include/osl/diagnose.hxx +++ b/include/osl/diagnose.hxx @@ -24,7 +24,6 @@ #include <sal/config.h> #include <cstddef> -#include <functional> #include <typeinfo> #include <unordered_set> @@ -85,7 +84,7 @@ namespace osl { namespace detail { -struct VoidPtrHash : ::std::unary_function<void const*, ::std::size_t> { +struct VoidPtrHash { ::std::size_t operator()( void const* p ) const { ::std::size_t const d = static_cast< ::std::size_t >( reinterpret_cast< ::std::ptrdiff_t >(p) ); diff --git a/include/svl/urlfilter.hxx b/include/svl/urlfilter.hxx index c607dd32c711..d7d9d1d106fd 100644 --- a/include/svl/urlfilter.hxx +++ b/include/svl/urlfilter.hxx @@ -21,10 +21,9 @@ #define INCLUDED_SVL_URLFILTER_HXX #include <tools/wldcrd.hxx> -#include <functional> #include <vector> -struct FilterMatch : public ::std::unary_function< bool, WildCard > +struct FilterMatch { private: const OUString& m_rCompareString; |