diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-03-18 19:58:53 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-03-19 05:26:50 +0000 |
| commit | 2667435ea5e6b73e58e57703b6fc3896e87eb370 (patch) | |
| tree | 27bfdcd59e28819e644cc6a8c475a1637d5df713 /include/osl | |
| parent | 96a9b38db5fd9c21bffe4274fa7d5083d4bc2ee9 (diff) | |
vcl: have AcquaSalInstance use osl::Condition instead of oslCondition
Condition is deprecated already, but there is no need for the
AcquaSalInstance 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: Ic495c4120a59480bf50a8c5b73608874fc4228ea
Reviewed-on: https://gerrit.libreoffice.org/35392
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'include/osl')
| -rw-r--r-- | include/osl/conditn.hxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/osl/conditn.hxx b/include/osl/conditn.hxx index bc96e2f4d0f5..07d697948077 100644 --- a/include/osl/conditn.hxx +++ b/include/osl/conditn.hxx @@ -28,6 +28,11 @@ #include <osl/conditn.h> +#if defined(MACOSX) && defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES) +# if __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES == 1 +# undef check +# endif +#endif namespace osl { |