diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-11 16:11:20 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:29 -0500 |
| commit | b67f62e299a22a33c32523db06f509ff92b5b829 (patch) | |
| tree | e3369077b53053223f44ba3d6c98c92f59f0a7c6 /extensions/test | |
| parent | 04df950dcc432834bbc2d3a27e13a7817eb775d5 (diff) | |
merge vosremoval-conditn patch
Diffstat (limited to 'extensions/test')
| -rw-r--r-- | extensions/test/sax/testsax.cxx | 2 | ||||
| -rw-r--r-- | extensions/test/stm/datatest.cxx | 2 | ||||
| -rw-r--r-- | extensions/test/stm/marktest.cxx | 2 | ||||
| -rw-r--r-- | extensions/test/stm/pipetest.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/extensions/test/sax/testsax.cxx b/extensions/test/sax/testsax.cxx index 1500cb76e52e..0a68f413e60e 100644 --- a/extensions/test/sax/testsax.cxx +++ b/extensions/test/sax/testsax.cxx @@ -37,7 +37,7 @@ #include <osl/time.h> #include <usr/weak.hxx> #include <tools/string.hxx> -#include <vos/conditn.hxx> +#include <osl/conditn.hxx> #include <smart/com/sun/star/io/XOutputStream.hxx> #include <smart/com/sun/star/xml/sax/SAXParseException.hxx> diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx index d9efab06b3e3..a35d187f114c 100644 --- a/extensions/test/stm/datatest.cxx +++ b/extensions/test/stm/datatest.cxx @@ -46,7 +46,7 @@ #include <usr/reflserv.hxx> // for EXTERN_SERVICE_CALLTYPE #include <usr/weak.hxx> // OWeakObject -#include <vos/conditn.hxx> +#include <osl/conditn.hxx> #include <vos/mutex.hxx> #include <osl/thread.hxx> diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx index 8bf12a271781..00b4e4910634 100644 --- a/extensions/test/stm/marktest.cxx +++ b/extensions/test/stm/marktest.cxx @@ -42,7 +42,7 @@ #include <usr/reflserv.hxx> // for EXTERN_SERVICE_CALLTYPE #include <usr/weak.hxx> // OWeakObject -#include <vos/conditn.hxx> +#include <osl/conditn.hxx> #include <vos/mutex.hxx> #include <osl/thread.hxx> diff --git a/extensions/test/stm/pipetest.cxx b/extensions/test/stm/pipetest.cxx index e516f41778dd..95adfd52c4c5 100644 --- a/extensions/test/stm/pipetest.cxx +++ b/extensions/test/stm/pipetest.cxx @@ -39,7 +39,7 @@ #include <usr/reflserv.hxx> // for EXTERN_SERVICE_CALLTYPE #include <usr/weak.hxx> // OWeakObject -#include <vos/conditn.hxx> +#include <osl/conditn.hxx> #include <vos/mutex.hxx> #include <osl/thread.hxx> |