diff options
| author | Daniel Robertson <danlrobertson89@gmail.com> | 2015-10-11 19:15:54 -0400 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-15 06:23:24 +0000 |
| commit | 39c7826c814fb8043942f5d9e1f1f049641865e8 (patch) | |
| tree | 5e921fa5608c5e9c5a866b15ba7be117455c9418 /slideshow/source/inc | |
| parent | 4b55c28940d741e53648115a9cfb58f2d6db38a5 (diff) | |
tdf#93243 slideshow: boost::bind -> C++11 lambdas
Replace boost::bind with C++11 lambdas. In addition, replace the use of
FuncT::result_type in ListenerOperations::notifyAllListeners with a less
type specific means of determining the return type of the function to be
applied in order to allow for the use of C++11 lambdas.
Change-Id: I1035be976e542d8b5bbd451c473a896d91ed66ca
Reviewed-on: https://gerrit.libreoffice.org/19314
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'slideshow/source/inc')
| -rw-r--r-- | slideshow/source/inc/listenercontainer.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slideshow/source/inc/listenercontainer.hxx b/slideshow/source/inc/listenercontainer.hxx index 4d45dbaf8f2d..db9f2aec3c45 100644 --- a/slideshow/source/inc/listenercontainer.hxx +++ b/slideshow/source/inc/listenercontainer.hxx @@ -104,7 +104,7 @@ template< typename ListenerT > struct ListenerOperations bool bRet(false); for( const auto& rCurr : rContainer ) { - if( FunctionApply< typename FuncT::result_type, + if( FunctionApply< typename ::std::result_of< FuncT( const typename ContainerT::value_type& ) >::type, typename ContainerT::value_type >::apply( func, rCurr) ) @@ -155,7 +155,7 @@ struct ListenerOperations< boost::weak_ptr<ListenerTargetT> > boost::shared_ptr<ListenerTargetT> pListener( rCurr.lock() ); if( pListener.get() && - FunctionApply< typename FuncT::result_type, + FunctionApply< typename ::std::result_of< FuncT( const typename ContainerT::value_type& ) >::type, boost::shared_ptr<ListenerTargetT> >::apply(func,pListener) ) { bRet = true; |