diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-02-02 15:40:33 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-03 11:56:27 +0100 |
| commit | e9089b4f53c0fef5d0bdcc76add9a43a8c6d81bd (patch) | |
| tree | 9823366f70104f0ff161a0332ed7195c45635384 /include | |
| parent | 85e6cc898c5d5a1d5d60897bef31da9f46b22686 (diff) | |
desktop: replace boost::bind with lambda or std::bind
This requires working around MSVC 2013 error C3848, that compiler
apparently just doesn't like to call its std::bind() functions if
they're "const".
Change-Id: Ic2e66cab3cadb36ab29cf2504a4c6107334f2ae1
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/threadex.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx index 47c1c44f76eb..358f1ca1849d 100644 --- a/include/vcl/threadex.hxx +++ b/include/vcl/threadex.hxx @@ -87,7 +87,11 @@ private: } css::uno::Any m_exc; +#ifdef _MSC_VER + FuncT m_func; // "const" and std::bind() results in Error C3848 expression would lose const-volatile qualifiers +#else FuncT const m_func; +#endif // using boost::optional here omits the need that ResultT is default // constructable: ::boost::optional<ResultT> m_result; |