diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-23 15:45:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-23 15:50:58 +0100 |
| commit | 0c7bff02710f8ad7915e215f723b6abad0079221 (patch) | |
| tree | 30ddfb6fedcd954f91bfa24f36df1dd7413804c4 /sal/osl/all | |
| parent | f4573ceb2965ccc8abc1f5165b0fa63f5d63649f (diff) | |
Changed sal/log.h -> sal/log.hxx, drop _S from C++ streaming log macros.
A compile time check ensures the common case of streaming just a plain
C-style string literal still produces reasonably compact call-site code.
The format-string variants are still available in sal/detail/log.h, but
only to be used in obsolete osl/diagnose.h etc., and going to be removed
again eventually.
Diffstat (limited to 'sal/osl/all')
| -rw-r--r-- | sal/osl/all/log.cxx | 3 | ||||
| -rw-r--r-- | sal/osl/all/logformat.hxx | 2 | ||||
| -rw-r--r-- | sal/osl/all/trace.cxx | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx index be45cf629b81..a43964436842 100644 --- a/sal/osl/all/log.cxx +++ b/sal/osl/all/log.cxx @@ -42,7 +42,8 @@ #include "osl/thread.hxx" #include "rtl/string.h" -#include "sal/log.h" +#include "sal/detail/log.h" +#include "sal/log.hxx" #include "sal/types.h" #include "logformat.hxx" diff --git a/sal/osl/all/logformat.hxx b/sal/osl/all/logformat.hxx index f4589a7b9f94..bb6ea4cc6bdd 100644 --- a/sal/osl/all/logformat.hxx +++ b/sal/osl/all/logformat.hxx @@ -34,7 +34,7 @@ #include <cstdarg> -#include "sal/log.h" +#include "sal/detail/log.h" namespace osl { namespace detail { diff --git a/sal/osl/all/trace.cxx b/sal/osl/all/trace.cxx index 835704779452..8fccb44b68d0 100644 --- a/sal/osl/all/trace.cxx +++ b/sal/osl/all/trace.cxx @@ -33,7 +33,8 @@ #include <cstdarg> #include "osl/diagnose.h" -#include "sal/log.h" +#include "sal/detail/log.h" +#include "sal/log.hxx" #include "logformat.hxx" |