diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-14 22:52:35 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-17 11:06:53 +0100 |
| commit | 6a0fe37dec107392fbe468a35b89071b9a93d2c1 (patch) | |
| tree | 4334feae68fa1ddc1ef293cd46ef483f44081c1c /include/rtl | |
| parent | 30f3b36e07ce37a3fe1909fb4b1419a00d2fdd81 (diff) | |
sal: clean up public headers with include-what-you-use
Sadly cannot forward declare "struct {...} TimeValue;".
rtl/(u)?string.hxx still include sal/log.hxx but removing osl/diagnose.h
was painful enough for now...
Change-Id: Id41e17f3870c4f24c53ce7b11f2c40a3d14d1f05
Diffstat (limited to 'include/rtl')
| -rw-r--r-- | include/rtl/byteseq.hxx | 2 | ||||
| -rw-r--r-- | include/rtl/instance.hxx | 2 | ||||
| -rw-r--r-- | include/rtl/ref.hxx | 1 | ||||
| -rw-r--r-- | include/rtl/string.hxx | 1 | ||||
| -rw-r--r-- | include/rtl/ustrbuf.hxx | 1 | ||||
| -rw-r--r-- | include/rtl/ustring.hxx | 1 |
6 files changed, 2 insertions, 6 deletions
diff --git a/include/rtl/byteseq.hxx b/include/rtl/byteseq.hxx index c54aa64018ae..c49e37125998 100644 --- a/include/rtl/byteseq.hxx +++ b/include/rtl/byteseq.hxx @@ -19,9 +19,7 @@ #ifndef INCLUDED_RTL_BYTESEQ_HXX #define INCLUDED_RTL_BYTESEQ_HXX -#include <osl/interlck.h> #include <rtl/byteseq.h> -#include <rtl/alloc.h> #include <new> diff --git a/include/rtl/instance.hxx b/include/rtl/instance.hxx index f8b75a75c50f..25f51732fcd0 100644 --- a/include/rtl/instance.hxx +++ b/include/rtl/instance.hxx @@ -23,7 +23,9 @@ #include <sal/config.h> #include <osl/doublecheckedlocking.h> +#if ! HAVE_THREADSAFE_STATICS #include <osl/getglobalmutex.hxx> +#endif namespace { diff --git a/include/rtl/ref.hxx b/include/rtl/ref.hxx index 77de66ab7348..942923ad6819 100644 --- a/include/rtl/ref.hxx +++ b/include/rtl/ref.hxx @@ -25,7 +25,6 @@ #include <cassert> #include <sal/types.h> -#include <osl/interlck.h> namespace rtl { diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx index 21cca1083914..0f65c430433a 100644 --- a/include/rtl/string.hxx +++ b/include/rtl/string.hxx @@ -27,7 +27,6 @@ #include <ostream> #include <string.h> -#include <osl/diagnose.h> #include <rtl/textenc.h> #include <rtl/string.h> #include <rtl/stringutils.hxx> diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx index 8ed738158b3d..64c26cff3424 100644 --- a/include/rtl/ustrbuf.hxx +++ b/include/rtl/ustrbuf.hxx @@ -25,7 +25,6 @@ #include <cassert> #include <string.h> -#include <osl/diagnose.h> #include <rtl/ustrbuf.h> #include <rtl/ustring.hxx> #include <rtl/stringutils.hxx> diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx index 66b320f09636..72048b31eee3 100644 --- a/include/rtl/ustring.hxx +++ b/include/rtl/ustring.hxx @@ -27,7 +27,6 @@ #include <ostream> #include <string.h> -#include <osl/diagnose.h> #include <rtl/ustring.h> #include <rtl/string.hxx> #include <rtl/stringutils.hxx> |