slideshow/source/engine/eventmultiplexer.cxx | 2 +-
slideshow/source/inc/listenercontainer.hxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f09c19d94ad97d03c64e318d153e93b53c099daf
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jul 21 18:00:25 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Jul 21 22:50:32 2020 +0200
Deprecated std::result_of has been removed from C++20
...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 <sberg...@redhat.com>
diff --git a/slideshow/source/engine/eventmultiplexer.cxx
b/slideshow/source/engine/eventmultiplexer.cxx
index 888f9039fd12..678c44e42e50 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -94,7 +94,7 @@ struct
slideshow::internal::ListenerOperations<ViewEventHandlerWeakPtrWrapper>
std::shared_ptr<ViewEventHandler> pListener( rCurr.ptr.lock() );
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) )
{
bRet = true;
diff --git a/slideshow/source/inc/listenercontainer.hxx
b/slideshow/source/inc/listenercontainer.hxx
index 6046f5f8efe4..8deb1be90617 100644
--- a/slideshow/source/inc/listenercontainer.hxx
+++ b/slideshow/source/inc/listenercontainer.hxx
@@ -84,7 +84,7 @@ template< typename ListenerT > struct ListenerOperations
bool bRet(false);
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(
func,
rCurr) )
@@ -135,7 +135,7 @@ struct ListenerOperations< std::weak_ptr<ListenerTargetT> >
std::shared_ptr<ListenerTargetT> pListener( rCurr.lock() );
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) )
{
bRet = true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
