include/vcl/threadex.hxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 67c11b0398cc12b9cfe81566eb0e158446411333
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jan 19 20:51:13 2018 +0100
vcl: various std::*::result_type deprecated in C++17
Use decltype instead, to prevent MSVC 2017.5 warnings.
Change-Id: I760659837e34eb2dc2a3293c43e7f29725b515d6
Reviewed-on: https://gerrit.libreoffice.org/48221
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx
index 954593e6604e..5eadc125c748 100644
--- a/include/vcl/threadex.hxx
+++ b/include/vcl/threadex.hxx
@@ -155,10 +155,10 @@ private:
@return return value of functor
*/
template <typename FuncT>
-inline typename FuncT::result_type syncExecute( FuncT const& func )
+inline auto syncExecute(FuncT const& func) -> decltype(func())
{
return detail::GenericSolarThreadExecutor<
- FuncT, typename FuncT::result_type>::exec(func);
+ FuncT, decltype(func())>::exec(func);
}
} // namespace solarthread
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
