diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2016-11-24 21:40:01 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-17 12:28:29 +0100 |
| commit | 9d4177da27650c963caf0a4880dc5ffb8e4468bc (patch) | |
| tree | a55bc243374403cd427c1f46a6e039eb50f4256d /include | |
| parent | b906734764e8bc20e504c521e3097ea3a5c3192a (diff) | |
osl::Condition - add deprecated markup. Use std::condition_variable.
Change-Id: Id3488a46b12d41bada2711b135ca955259d6e448
Reviewed-on: https://gerrit.libreoffice.org/31176
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit ab45b41efe1109e015ecfcb670547d44026e4764)
Diffstat (limited to 'include')
| -rw-r--r-- | include/osl/conditn.h | 5 | ||||
| -rw-r--r-- | include/osl/conditn.hxx | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/osl/conditn.h b/include/osl/conditn.h index c00879873101..d0c56a33e643 100644 --- a/include/osl/conditn.h +++ b/include/osl/conditn.h @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_OSL_CONDITN_H #define INCLUDED_OSL_CONDITN_H @@ -40,6 +39,10 @@ typedef enum { } oslConditionResult; /** Creates a condition. + + @deprecated use C++11's std::condition_variable instead + for a more robust and helpful condition. + The condition is in the reset-state. @returns 0 if condition could not be created. */ diff --git a/include/osl/conditn.hxx b/include/osl/conditn.hxx index 2e91dd07d5ae..bc96e2f4d0f5 100644 --- a/include/osl/conditn.hxx +++ b/include/osl/conditn.hxx @@ -32,6 +32,11 @@ namespace osl { /** + * A deprecated condition. + * + * @deprecated use C++11's std::condition_variable instead + * for a more robust and helpful condition. + * * Warning: the Condition abstraction is inadequate for any * situation where there may be multiple threads setting, * waiting, and resetting the same condition. It can only be @@ -50,7 +55,11 @@ namespace osl result_timeout = osl_cond_result_timeout }; - /* Create a condition. + /** + * Create a condition. + * + * @deprecated use C++11's std::condition_variable instead + * for a more robust and helpful condition. */ Condition() { |