diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-11 16:12:59 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:36 -0500 |
| commit | d57d662ac71680881fd24e1a3fd857d2e5116acb (patch) | |
| tree | 37df0ad0e3036e59e49a8258d1386e16f38376d1 /unotools | |
| parent | 407f8c9293b95106ed8ca1ea09d000d975a8583d (diff) | |
merge vosremoval-conditn patch
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/inc/unotools/ucblockbytes.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unotools/inc/unotools/ucblockbytes.hxx b/unotools/inc/unotools/ucblockbytes.hxx index df414d3b6bf4..f06f9d9522e5 100644 --- a/unotools/inc/unotools/ucblockbytes.hxx +++ b/unotools/inc/unotools/ucblockbytes.hxx @@ -35,7 +35,7 @@ #include "unotools/unotoolsdllapi.h" #include <osl/thread.hxx> -#include <vos/conditn.hxx> +#include <osl/conditn.hxx> #include <vos/mutex.hxx> #include <tools/stream.hxx> #include <tools/link.hxx> @@ -105,8 +105,8 @@ SV_DECL_IMPL_REF( UcbLockBytesHandler ) class UNOTOOLS_DLLPUBLIC UcbLockBytes : public virtual SvLockBytes { - vos::OCondition m_aInitialized; - vos::OCondition m_aTerminated; + osl::Condition m_aInitialized; + osl::Condition m_aTerminated; vos::OMutex m_aMutex; String m_aContentType; |