diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-03-18 18:32:13 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-03-18 08:24:25 +0000 |
| commit | 396138719206d5033faaeaf09b88437cbb3480e7 (patch) | |
| tree | 7c9741171c3b35cfdee628c68f280e38b0b9d223 /include/salhelper | |
| parent | 5ec1713ae5b177ae32970c7209cea55ee0041c5c (diff) | |
salhelper: change oslCondition to osl::Condition
Condition is deprecated already, but there is no need for the
us 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
Change-Id: Ia362666ff241293e143de0fa1dc0bc3a990bef82
Reviewed-on: https://gerrit.libreoffice.org/35388
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'include/salhelper')
| -rw-r--r-- | include/salhelper/condition.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/salhelper/condition.hxx b/include/salhelper/condition.hxx index 86e9223dad98..a124a65cb7bb 100644 --- a/include/salhelper/condition.hxx +++ b/include/salhelper/condition.hxx @@ -22,7 +22,7 @@ #define INCLUDED_SALHELPER_CONDITION_HXX -#include <osl/conditn.h> +#include <osl/conditn.hxx> #include <osl/mutex.hxx> #include <salhelper/salhelperdllapi.h> @@ -53,8 +53,8 @@ namespace salhelper Condition(Condition &) SAL_DELETED_FUNCTION; void operator =(Condition &) SAL_DELETED_FUNCTION; - osl::Mutex& m_aMutex; - oslCondition m_aCondition; + osl::Mutex& m_aMutex; + osl::Condition m_aCondition; }; |