summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-03-18 16:11:05 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2017-03-18 08:02:26 +0000
commit5ec1713ae5b177ae32970c7209cea55ee0041c5c (patch)
treec1322d5fd439f9305dafe8dd4f790e7db2ead3ef /include
parent1e7d1f27217c0fe33009552bd6a0bc6523f821ed (diff)
vcl: have SolarThreadExecutor use osl::Condition, not oslCondition
Condition is deprecated already, but there is no need for the SolarThreadExecutor class to use the low-level C-API, when in fact there is a C++ fascade that calls on this via the C++ abstraction, osl::Condition. This will make it much easier to switch to using std::condition_variable in the future. Change-Id: I81e8530d42fe1451c4ca5bce998b13de0576bc4e Reviewed-on: https://gerrit.libreoffice.org/35386 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'include')
-rw-r--r--include/vcl/threadex.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx
index 076974b0721e..6330a71bcc28 100644
--- a/include/vcl/threadex.hxx
+++ b/include/vcl/threadex.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_THREADEX_HXX
#define INCLUDED_VCL_THREADEX_HXX
-#include <osl/conditn.h>
+#include <osl/conditn.hxx>
#include <osl/thread.h>
#include <tools/link.hxx>
#include <vcl/dllapi.h>
@@ -33,8 +33,8 @@ namespace vcl
{
class VCL_DLLPUBLIC SolarThreadExecutor
{
- oslCondition m_aStart;
- oslCondition m_aFinish;
+ osl::Condition m_aStart;
+ osl::Condition m_aFinish;
long m_nReturn;
bool m_bTimeout;