diff options
| author | Michael Stahl <mstahl@redhat.com> | 2018-01-19 20:51:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-01-22 09:34:09 +0100 |
| commit | 67c11b0398cc12b9cfe81566eb0e158446411333 (patch) | |
| tree | 1bcdc4b7e5e369f27a1a4b52a7a780e3eea2ab45 | |
| parent | C++17 deprecated std::shared_ptr::unique() (diff) | |
| download | core-67c11b0398cc12b9cfe81566eb0e158446411333.tar.gz core-67c11b0398cc12b9cfe81566eb0e158446411333.zip | |
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 <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | include/vcl/threadex.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
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 |