mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecated std::result_of has been removed from C++20

Browse Source 
...and is no longer provided at least by VS 2019 16.6.4 when using
--with-latest-c++

Change-Id: Iac68bd4eb74a1f805d30cca49da59f35d8af4240
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99169
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2020-07-21 18:00:25 +02:00
parent 28eb1488f3
commit f09c19d94a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slideshow/source/engine/eventmultiplexer.cxx
View File

@@ -94,7 +94,7 @@ struct slideshow::internal::ListenerOperations<ViewEventHandlerWeakPtrWrapper>
std::shared_ptr<ViewEventHandler> pListener( rCurr.ptr.lock() ); std::shared_ptr<ViewEventHandler> pListener( rCurr.ptr.lock() );
if( pListener.get() && if( pListener.get() &&
FunctionApply<typename ::std::result_of<FuncT (std::shared_ptr<ViewEventHandler> const&)>::type, FunctionApply<typename ::std::invoke_result<FuncT, std::shared_ptr<ViewEventHandler> const&>::type,
std::shared_ptr<ViewEventHandler> >::apply(func,pListener) ) std::shared_ptr<ViewEventHandler> >::apply(func,pListener) )
{ {
bRet = true; bRet = true;

4
slideshow/source/inc/listenercontainer.hxx
View File

@@ -84,7 +84,7 @@ template< typename ListenerT > struct ListenerOperations
bool bRet(false); bool bRet(false);
for( const auto& rCurr : rContainer ) for( const auto& rCurr : rContainer )
{ {
if( FunctionApply< typename ::std::result_of< FuncT( const typename ContainerT::value_type& ) >::type, if( FunctionApply< typename ::std::invoke_result< FuncT, const typename ContainerT::value_type& >::type,
typename ContainerT::value_type >::apply( typename ContainerT::value_type >::apply(
func, func,
rCurr) ) rCurr) )
@@ -135,7 +135,7 @@ struct ListenerOperations< std::weak_ptr<ListenerTargetT> >
std::shared_ptr<ListenerTargetT> pListener( rCurr.lock() ); std::shared_ptr<ListenerTargetT> pListener( rCurr.lock() );
if( pListener.get() && if( pListener.get() &&
FunctionApply<typename ::std::result_of<FuncT (std::shared_ptr<ListenerTargetT> const&)>::type, FunctionApply<typename ::std::invoke_result<FuncT, std::shared_ptr<ListenerTargetT> const&>::type,
std::shared_ptr<ListenerTargetT> >::apply(func,pListener) ) std::shared_ptr<ListenerTargetT> >::apply(func,pListener) )
{ {
bRet = true; bRet = true;