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 /connectivity | |
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 'connectivity')
-rw-r--r-- | connectivity/source/cpool/ZConnectionPool.cxx | 5 | ||||
-rw-r--r-- | connectivity/source/manager/mdrivermanager.cxx | 8 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VDescriptor.cxx | 5 |
3 files changed, 8 insertions, 10 deletions
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index 0e6be4f36039..ce485b45cd75 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -77,8 +77,7 @@ OConnectionPool::~OConnectionPool() clear(false); } -struct TRemoveEventListenerFunctor : std::unary_function<TPooledConnections::value_type,void> - ,std::unary_function<TActiveConnectionMap::value_type,void> +struct TRemoveEventListenerFunctor { OConnectionPool* m_pConnectionPool; bool m_bDispose; @@ -113,7 +112,7 @@ struct TRemoveEventListenerFunctor : std::unary_function<TPooledConnections::val } }; -struct TConnectionPoolFunctor : std::unary_function<TConnectionMap::value_type,void> +struct TConnectionPoolFunctor { OConnectionPool* m_pConnectionPool; diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index bbc6314d5e32..3905932fed85 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -103,7 +103,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) /// an STL functor which ensures that a SdbcDriver described by a DriverAccess is loaded - struct EnsureDriver : public std::unary_function< DriverAccess, DriverAccess > + struct EnsureDriver { explicit EnsureDriver( const Reference< XComponentContext > &rxContext ) : mxContext( rxContext ) {} @@ -138,7 +138,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) }; /// an STL functor which extracts a SdbcDriver from a DriverAccess - struct ExtractDriverFromAccess : public std::unary_function< DriverAccess, const Reference<XDriver>& > + struct ExtractDriverFromAccess { const Reference<XDriver>& operator()( const DriverAccess& _rAccess ) const { @@ -146,7 +146,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) } }; - struct ExtractDriverFromCollectionElement : public std::unary_function< DriverCollection::value_type, const Reference<XDriver>& > + struct ExtractDriverFromCollectionElement { const Reference<XDriver>& operator()( const DriverCollection::value_type& _rElement ) const { @@ -155,7 +155,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) }; // predicate for checking whether or not a driver accepts a given URL - class AcceptsURL : public std::unary_function< Reference<XDriver>, bool > + class AcceptsURL { protected: const OUString& m_rURL; diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx index fa0bb3fe2459..5c9c899f7991 100644 --- a/connectivity/source/sdbcx/VDescriptor.cxx +++ b/connectivity/source/sdbcx/VDescriptor.cxx @@ -20,7 +20,6 @@ #include <connectivity/sdbcx/VDescriptor.hxx> #include <cppuhelper/queryinterface.hxx> -#include <functional> #include <algorithm> #include <string.h> @@ -64,14 +63,14 @@ namespace connectivity namespace { - struct ResetROAttribute : public std::unary_function< Property, void > + struct ResetROAttribute { void operator ()( Property& _rProperty ) const { _rProperty.Attributes &= ~PropertyAttribute::READONLY; } }; - struct SetROAttribute : public std::unary_function< Property, void > + struct SetROAttribute { void operator ()( Property& _rProperty ) const { |